Simplify how the name of the resource is constructed so that it can handle resources nested multiple directory levels in.
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
%li.resource{:id => "resource_${name}"}
|
%li.resource{:id => "resource_${name}"}
|
||||||
.heading
|
.heading
|
||||||
%h2
|
%h2
|
||||||
%a{:href => "#!/${name}", :onclick => "Docs.toggleEndpointListForResource('${name}');"} ${name}
|
%a{:href => "#!/${name}", :onclick => "Docs.toggleEndpointListForResource('${name}');"} ${path}
|
||||||
%ul.options
|
%ul.options
|
||||||
%li
|
%li
|
||||||
%a{:href => "#!/${name}", :id => "endpointListTogger_${name}", :onclick => "Docs.toggleEndpointListForResource('${name}');"} Show/Hide
|
%a{:href => "#!/${name}", :id => "endpointListTogger_${name}", :onclick => "Docs.toggleEndpointListForResource('${name}');"} Show/Hide
|
||||||
|
|||||||
@@ -57,17 +57,12 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
|
|||||||
ApiResource.include({
|
ApiResource.include({
|
||||||
path_json: null,
|
path_json: null,
|
||||||
path_xml: null,
|
path_xml: null,
|
||||||
|
|
||||||
init: function(atts) {
|
init: function(atts) {
|
||||||
if (atts) this.load(atts);
|
if (atts) this.load(atts);
|
||||||
|
this.name = this.path.replace(".{format}", "").replace(/\//g, "_");
|
||||||
this.path_json = this.path.replace("{format}", "json");
|
this.path_json = this.path.replace("{format}", "json");
|
||||||
this.path_xml = this.path.replace("{format}", "xml");
|
this.path_xml = this.path.replace("{format}", "xml");
|
||||||
this.baseUrl = globalBasePath;
|
this.baseUrl = globalBasePath;
|
||||||
//execluded 9 letters to remove .{format} from name
|
|
||||||
this.name = this.path.split("/");
|
|
||||||
this.name = this.name[this.name.length - 1];
|
|
||||||
this.name = this.name.replace(".{format}",'').replace(/\//g, "_");
|
|
||||||
// this.name = this.path.substr(1, this.path.length - formatString.length - 1).replace(/\//g, "_");
|
|
||||||
this.apiList = Api.sub();
|
this.apiList = Api.sub();
|
||||||
this.modelList = ApiModel.sub();
|
this.modelList = ApiModel.sub();
|
||||||
},
|
},
|
||||||
@@ -95,6 +90,9 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
|
|||||||
init: function(atts) {
|
init: function(atts) {
|
||||||
if (atts) this.load(atts);
|
if (atts) this.load(atts);
|
||||||
|
|
||||||
|
var sep = this.path.lastIndexOf("/");
|
||||||
|
this.name = this.path.substr(0, sep).replace(".{format}", "").replace(/\//g, "_");
|
||||||
|
|
||||||
var secondPathSeperatorIndex = this.path.indexOf("/", 1);
|
var secondPathSeperatorIndex = this.path.indexOf("/", 1);
|
||||||
if (secondPathSeperatorIndex > 0) {
|
if (secondPathSeperatorIndex > 0) {
|
||||||
var prefix = this.path.substr(0, secondPathSeperatorIndex);
|
var prefix = this.path.substr(0, secondPathSeperatorIndex);
|
||||||
@@ -102,21 +100,9 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
|
|||||||
// log(this.path + ":: " + prefix + "..." + suffix);
|
// log(this.path + ":: " + prefix + "..." + suffix);
|
||||||
this.path_json = prefix.replace("{format}", "json") + suffix;
|
this.path_json = prefix.replace("{format}", "json") + suffix;
|
||||||
this.path_xml = prefix.replace("{format}", "xml") + suffix;;
|
this.path_xml = prefix.replace("{format}", "xml") + suffix;;
|
||||||
|
|
||||||
if (this.path.indexOf("/") == 0) {
|
|
||||||
this.name = this.path.substr(1, secondPathSeperatorIndex - formatString.length - 1);
|
|
||||||
} else {
|
|
||||||
this.name = this.path.substr(0, secondPathSeperatorIndex - formatString.length - 1);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this.path_json = this.path.replace("{format}", "json");
|
this.path_json = this.path.replace("{format}", "json");
|
||||||
this.path_xml = this.path.replace("{format}", "xml");
|
this.path_xml = this.path.replace("{format}", "xml");
|
||||||
|
|
||||||
if (this.path.indexOf("/") == 0) {
|
|
||||||
this.name = this.path.substr(1, this.path.length - formatString.length - 1);
|
|
||||||
} else {
|
|
||||||
this.name = this.path.substr(0, this.path.length - formatString.length - 1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var value = this.operations;
|
var value = this.operations;
|
||||||
|
|||||||
Reference in New Issue
Block a user