Skip to content
Snippets Groups Projects

Resolve "Rest API should follow google guidlines"

Merged Piotr Gawron requested to merge 90-rest-api-should-follow-google-guidlines into master
9 files
+ 148
21
Compare changes
  • Side-by-side
  • Inline
Files
9
@@ -381,7 +381,13 @@ ServerConnector.getOverlayElementsUrl = function(queryParams, filterParams) {
};
ServerConnector.getFullOverlayElementUrl = function(params, token) {
ServerConnector.getFullOverlayElementUrl = function(queryParams, filterParams) {
return this.getApiUrl({
url : this.getAliasesUrl(queryParams) + queryParams.id + "/",
params : filterParams,
});
return this.getApiUrl({
type : "overlay",
method : "getOverlayElement",
@@ -426,11 +432,16 @@ ServerConnector.columnsToString = function(columns) {
return columns;
};
ServerConnector.getModelsUrl = function(params) {
var modelId = this.getIdOrAsterisk(params.modelId);
ServerConnector.getModelsUrl = function(queryParams) {
var modelId = this.getIdOrAsterisk(queryParams.modelId);
var overlayId = queryParams.overlayId;
var url = this.getProjectsUrl(queryParams);
if (overlayId !== undefined) {
url = this.getOverlayByIdUrl(queryParams);
}
return this.getApiUrl({
url : this.getProjectsUrl(params) + "models/" + modelId + "/",
url : url + "models/" + modelId + "/",
});
};
@@ -846,12 +857,19 @@ ServerConnector.getFullOverlayElement = function(params) {
var self = this;
var token = null;
var queryParams = {
overlayId : params.overlay.getId(),
modelId : params.element.getModelId(),
id : params.element.getId(),
}
var filterParams = {};
return self.getToken().then(function(result) {
token = result;
filterParams.token = result;
return self.getProjectId(params.projectId);
}).then(function(result) {
params.projectId = result;
return self.readFile(self.getFullOverlayElementUrl(params, token));
queryParams.projectId = result;
return self.readFile(self.getFullOverlayElementUrl(queryParams, filterParams));
}).then(function(content) {
var element = JSON.parse(content);
var result = null;
Loading