kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated client per #669

Browse Source
This commit is contained in:
Tony Tam
2014-10-18 15:25:28 -07:00
parent dc84dfc8f8
commit 4d1e48df39
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/lib/swagger-client.js vendored
View File

@@ -1002,7 +1002,7 @@ var Model = function(name, definition) {
this.name = name; this.name = name;
this.definition = definition || {}; this.definition = definition || {};
this.properties = []; this.properties = [];
var requiredFields = definition.enum || []; var requiredFields = definition.required || [];
var key; var key;
var props = definition.properties; var props = definition.properties;
@@ -1063,7 +1063,7 @@ Model.prototype.getMockSignature = function(modelsToIgnore) {
var prop = this.properties[i]; var prop = this.properties[i];
var ref = prop['$ref']; var ref = prop['$ref'];
var model = models[ref]; var model = models[ref];
if (model && typeof modelsToIgnore === 'undefined') { if (model && typeof modelsToIgnore[model.name] === 'undefined') {
returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore)); returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
} }
} }
@@ -1085,6 +1085,7 @@ var Property = function(name, obj, required) {
obj = obj.items; obj = obj.items;
} }
this.name = name; this.name = name;
this.description = obj.description;
this.obj = obj; this.obj = obj;
this.optional = true; this.optional = true;
this.example = obj.example || null; this.example = obj.example || null;
@@ -1182,12 +1183,17 @@ simpleRef = function(name) {
Property.prototype.toString = function() { Property.prototype.toString = function() {
var str = getStringSignature(this.obj); var str = getStringSignature(this.obj);
if(str !== '') if(str !== '') {
str = this.name + ' : ' + str; str = '<span class="propName ' + this.required + '">' + this.name + '</span> (<span class="propType">' + str + '</span>';
if(!this.required)
str += ', <span class="propOptKey">optional</span>';
str += ')';
}
else else
str = this.name + ' : ' + JSON.stringify(this.obj); str = this.name + ' (' + JSON.stringify(this.obj) + ')';
if(!this.required)
str += ' (optional)'; if(typeof this.description !== 'undefined')
str += ': ' + this.description;
return str; return str;
} }

20
lib/swagger-client.js
View File

@@ -1002,7 +1002,7 @@ var Model = function(name, definition) {
this.name = name; this.name = name;
this.definition = definition || {}; this.definition = definition || {};
this.properties = []; this.properties = [];
var requiredFields = definition.enum || []; var requiredFields = definition.required || [];
var key; var key;
var props = definition.properties; var props = definition.properties;
@@ -1063,7 +1063,7 @@ Model.prototype.getMockSignature = function(modelsToIgnore) {
var prop = this.properties[i]; var prop = this.properties[i];
var ref = prop['$ref']; var ref = prop['$ref'];
var model = models[ref]; var model = models[ref];
if (model && typeof modelsToIgnore === 'undefined') { if (model && typeof modelsToIgnore[model.name] === 'undefined') {
returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore)); returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
} }
} }
@@ -1085,6 +1085,7 @@ var Property = function(name, obj, required) {
obj = obj.items; obj = obj.items;
} }
this.name = name; this.name = name;
this.description = obj.description;
this.obj = obj; this.obj = obj;
this.optional = true; this.optional = true;
this.example = obj.example || null; this.example = obj.example || null;
@@ -1182,12 +1183,17 @@ simpleRef = function(name) {
Property.prototype.toString = function() { Property.prototype.toString = function() {
var str = getStringSignature(this.obj); var str = getStringSignature(this.obj);
if(str !== '') if(str !== '') {
str = this.name + ' : ' + str; str = '<span class="propName ' + this.required + '">' + this.name + '</span> (<span class="propType">' + str + '</span>';
if(!this.required)
str += ', <span class="propOptKey">optional</span>';
str += ')';
}
else else
str = this.name + ' : ' + JSON.stringify(this.obj); str = this.name + ' (' + JSON.stringify(this.obj) + ')';
if(!this.required)
str += ' (optional)'; if(typeof this.description !== 'undefined')
str += ': ' + this.description;
return str; return str;
} }