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

Merge pull request #2105 from Oduig/master

Browse Source 
Fix generated XML when property definitions reference primitive types
This commit is contained in:
Tony Tam
2016-04-21 09:32:37 -07:00
parent ababd52829 eb30aed1a8
commit d7184b3d64
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/swagger-ui.js vendored
View File

@@ -22004,7 +22004,7 @@ SwaggerUi.partials.signature = (function () {
function getDescriptorByRef($ref, name, models, config) { function getDescriptorByRef($ref, name, models, config) {
var modelType = simpleRef($ref); var modelType = simpleRef($ref);
var model = models[modelType] || {}; var model = models[modelType] || {};
var type = model.type || 'object'; var type = model.definition && model.definition.type ? model.definition.type : 'object';
name = name || model.name; name = name || model.name;
if (config.modelsToIgnore.indexOf($ref) > -1) { if (config.modelsToIgnore.indexOf($ref) > -1) {

2
src/main/javascript/view/partials/signature.js
View File

@@ -899,7 +899,7 @@ SwaggerUi.partials.signature = (function () {
function getDescriptorByRef($ref, name, models, config) { function getDescriptorByRef($ref, name, models, config) {
var modelType = simpleRef($ref); var modelType = simpleRef($ref);
var model = models[modelType] || {}; var model = models[modelType] || {};
var type = model.type || 'object'; var type = model.definition && model.definition.type ? model.definition.type : 'object';
name = name || model.name; name = name || model.name;
if (config.modelsToIgnore.indexOf($ref) > -1) { if (config.modelsToIgnore.indexOf($ref) > -1) {