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

merged from develop, added fix for #627

Browse Source
This commit is contained in:
Tony Tam
2014-12-02 22:24:47 -08:00
parent 855c015a3f
commit 6961dd7f92
8 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/swagger-client.js
View File

@@ -513,7 +513,11 @@ SwaggerClient.prototype.idFromOp = function(path, httpMethod, op) {
return (op.operationId);
}
else {
return path.substring(1).replace(/\//g, "_").replace(/\{/g, "").replace(/\}/g, "") + "_" + httpMethod;
return path.substring(1)
.replace(/\//g, "_")
.replace(/\{/g, "")
.replace(/\}/g, "")
.replace(/\./g, "_") + "_" + httpMethod;
}
}
@@ -658,8 +662,8 @@ Operation.prototype.getType = function (param) {
str = 'integer';
else if(type === 'integer' && format === 'int64')
str = 'long';
else if(type === 'integer' && typeof format === 'undefined')
str = 'long';
else if(type === 'integer')
str = 'integer'
else if(type === 'string' && format === 'date-time')
str = 'date-time';
else if(type === 'string' && format === 'date')
@@ -668,7 +672,7 @@ Operation.prototype.getType = function (param) {
str = 'float';
else if(type === 'number' && format === 'double')
str = 'double';
else if(type === 'number' && typeof format === 'undefined')
else if(type === 'number')
str = 'double';
else if(type === 'boolean')
str = 'boolean';
@@ -878,7 +882,12 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
// todo append?
args.body = encoded;
}
var url = this.scheme + '://' + this.host + this.basePath + requestUrl + querystring;
var url = this.scheme + '://' + this.host;
if(this.basePath !== '/')
url += this.basePath;
url += requestUrl + querystring;
var obj = {
url: url,