Infer root resource name from baseUrl.
This commit is contained in:
@@ -2529,12 +2529,8 @@ arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return th
|
|||||||
|
|
||||||
// adeed by ayush
|
// adeed by ayush
|
||||||
createAll: function(values){
|
createAll: function(values){
|
||||||
// debugger;
|
|
||||||
values = this.fromJSON(values);
|
values = this.fromJSON(values);
|
||||||
|
for (var i=0, il = values.length; i < il; i++) {
|
||||||
// debugger;
|
|
||||||
|
|
||||||
for (var i=0, il = values.length; i < il; i++) {
|
|
||||||
var record = values[i];
|
var record = values[i];
|
||||||
record.newRecord = false;
|
record.newRecord = false;
|
||||||
record.id = record.id || Spine.guid();
|
record.id = record.id || Spine.guid();
|
||||||
|
|||||||
@@ -233,12 +233,8 @@
|
|||||||
|
|
||||||
// adeed by ayush
|
// adeed by ayush
|
||||||
createAll: function(values){
|
createAll: function(values){
|
||||||
// debugger;
|
|
||||||
values = this.fromJSON(values);
|
values = this.fromJSON(values);
|
||||||
|
for (var i=0, il = values.length; i < il; i++) {
|
||||||
// debugger;
|
|
||||||
|
|
||||||
for (var i=0, il = values.length; i < il; i++) {
|
|
||||||
var record = values[i];
|
var record = values[i];
|
||||||
record.newRecord = false;
|
record.newRecord = false;
|
||||||
record.id = record.id || Spine.guid();
|
record.id = record.id || Spine.guid();
|
||||||
|
|||||||
@@ -11,17 +11,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
baseUrl = ("http://" + baseUrl);
|
baseUrl = ("http://" + baseUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// baseUrl = baseUrl + "/resources.json";
|
|
||||||
|
|
||||||
// log("using base url " + baseUrl);
|
|
||||||
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
|
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
|
||||||
// debugger
|
var discoParts = baseUrl.split("/");
|
||||||
// var rootResourcesApiName = baseUrl.substr(baseUrl.lastIndexOf("/") + 1, (baseUrl.lastIndexOf(".") - baseUrl.lastIndexOf("/") - 1));
|
var rootResourcesApiName = discoParts[discoParts.length-1];
|
||||||
|
|
||||||
// assuming root swagger is resources
|
|
||||||
var rootResourcesApiName = "resources";
|
|
||||||
if (baseUrl.indexOf(".json") > -1) rootResourcesApiName += ".json";
|
|
||||||
|
|
||||||
var formatString = ".{format}";
|
var formatString = ".{format}";
|
||||||
var statusListener = statusCallback;
|
var statusListener = statusCallback;
|
||||||
var apiKey = _apiKey;
|
var apiKey = _apiKey;
|
||||||
@@ -79,7 +71,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
},
|
},
|
||||||
|
|
||||||
addApis: function(apiObjects) {
|
addApis: function(apiObjects) {
|
||||||
log("apiObjects: %o", apiObjects);
|
// log("apiObjects: %o", apiObjects);
|
||||||
this.apiList.createAll(apiObjects);
|
this.apiList.createAll(apiObjects);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -402,10 +394,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
var controller = this;
|
var controller = this;
|
||||||
updateStatus("Fetching " + apiResource.name + "...");
|
updateStatus("Fetching " + apiResource.name + "...");
|
||||||
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
|
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
|
||||||
log("resourceUrl: %o", resourceUrl);
|
// log("resourceUrl: %o", resourceUrl);
|
||||||
$.getJSON(resourceUrl,
|
$.getJSON(resourceUrl,
|
||||||
function(response) {
|
function(response) {
|
||||||
log(response);
|
|
||||||
controller.loadResources(response, apiResource);
|
controller.loadResources(response, apiResource);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -432,7 +423,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
updateStatus();
|
updateStatus();
|
||||||
} finally {
|
} finally {
|
||||||
if (this.countLoaded == ApiResource.count()) {
|
if (this.countLoaded == ApiResource.count()) {
|
||||||
log("all models/api loaded");
|
// log("all models/api loaded");
|
||||||
ApiResource.trigger("refresh");
|
ApiResource.trigger("refresh");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,12 +233,8 @@
|
|||||||
|
|
||||||
// adeed by ayush
|
// adeed by ayush
|
||||||
createAll: function(values){
|
createAll: function(values){
|
||||||
// debugger;
|
|
||||||
values = this.fromJSON(values);
|
values = this.fromJSON(values);
|
||||||
|
for (var i=0, il = values.length; i < il; i++) {
|
||||||
// debugger;
|
|
||||||
|
|
||||||
for (var i=0, il = values.length; i < il; i++) {
|
|
||||||
var record = values[i];
|
var record = values[i];
|
||||||
record.newRecord = false;
|
record.newRecord = false;
|
||||||
record.id = record.id || Spine.guid();
|
record.id = record.id || Spine.guid();
|
||||||
|
|||||||
@@ -11,17 +11,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
baseUrl = ("http://" + baseUrl);
|
baseUrl = ("http://" + baseUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// baseUrl = baseUrl + "/resources.json";
|
|
||||||
|
|
||||||
// log("using base url " + baseUrl);
|
|
||||||
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
|
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
|
||||||
// debugger
|
var discoParts = baseUrl.split("/");
|
||||||
// var rootResourcesApiName = baseUrl.substr(baseUrl.lastIndexOf("/") + 1, (baseUrl.lastIndexOf(".") - baseUrl.lastIndexOf("/") - 1));
|
var rootResourcesApiName = discoParts[discoParts.length-1];
|
||||||
|
|
||||||
// assuming root swagger is resources
|
|
||||||
var rootResourcesApiName = "resources";
|
|
||||||
if (baseUrl.indexOf(".json") > -1) rootResourcesApiName += ".json";
|
|
||||||
|
|
||||||
var formatString = ".{format}";
|
var formatString = ".{format}";
|
||||||
var statusListener = statusCallback;
|
var statusListener = statusCallback;
|
||||||
var apiKey = _apiKey;
|
var apiKey = _apiKey;
|
||||||
@@ -79,7 +71,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
},
|
},
|
||||||
|
|
||||||
addApis: function(apiObjects) {
|
addApis: function(apiObjects) {
|
||||||
log("apiObjects: %o", apiObjects);
|
// log("apiObjects: %o", apiObjects);
|
||||||
this.apiList.createAll(apiObjects);
|
this.apiList.createAll(apiObjects);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -402,10 +394,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
var controller = this;
|
var controller = this;
|
||||||
updateStatus("Fetching " + apiResource.name + "...");
|
updateStatus("Fetching " + apiResource.name + "...");
|
||||||
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
|
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
|
||||||
log("resourceUrl: %o", resourceUrl);
|
// log("resourceUrl: %o", resourceUrl);
|
||||||
$.getJSON(resourceUrl,
|
$.getJSON(resourceUrl,
|
||||||
function(response) {
|
function(response) {
|
||||||
log(response);
|
|
||||||
controller.loadResources(response, apiResource);
|
controller.loadResources(response, apiResource);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -432,7 +423,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
|
|||||||
updateStatus();
|
updateStatus();
|
||||||
} finally {
|
} finally {
|
||||||
if (this.countLoaded == ApiResource.count()) {
|
if (this.countLoaded == ApiResource.count()) {
|
||||||
log("all models/api loaded");
|
// log("all models/api loaded");
|
||||||
ApiResource.trigger("refresh");
|
ApiResource.trigger("refresh");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user