diff --git a/app/index.js b/app/index.js index 7634010..54d2d2d 100644 --- a/app/index.js +++ b/app/index.js @@ -82,7 +82,7 @@ var getLocalApplications = function() { && applications[k].uniqueId == localApplications[i].uniqueId && applications[k].createdBy == userId) { - entry.find("select").data("application-id", applications[i].id); + entry.find("select").data("application-id", applications[k].id); serverId = applications[k].server; break; } @@ -139,31 +139,33 @@ var getMyApplications = function() { xmlStrings.push(''); xmlStrings.push(""); for (var i = 0; i < res.data.length; i++) { - xmlStrings.push(""); - xmlStrings.push("" + res.data[i].name + ""); - xmlStrings.push("" + res.data[i].unique_id + ""); - for (var k = 0; k < servers.length; k++) { - if (servers[k].data.id == res.data[i].server) { - xmlStrings.push("" + servers[k].data.ipaddress + ""); - applications.push({ - id: res.data[i].id, - name: res.data[i].name, - uniqueId: res.data[i].unique_id, - server: res.data[i].server, - ipAddress: servers[k].data.ipaddress, - createdBy: userId + if (res.data[i].created_by == userId) { + xmlStrings.push(""); + xmlStrings.push("" + res.data[i].name + ""); + xmlStrings.push("" + res.data[i].unique_id + ""); + for (var k = 0; k < servers.length; k++) { + if (servers[k].data.id == res.data[i].server) { + xmlStrings.push("" + servers[k].data.ipaddress + ""); + applications.push({ + id: res.data[i].id, + name: res.data[i].name, + uniqueId: res.data[i].unique_id, + server: res.data[i].server, + ipAddress: servers[k].data.ipaddress, + createdBy: userId + }); + } + } + xmlStrings.push(""); + + // for Chrome + if (res.data[i].name == "Chrome") { + localApplications.push({ + name: "Chrome", + uniqueId: res.data[i].unique_id }); } } - xmlStrings.push(""); - - // for Chrome - if (res.data[i].name == "Chrome") { - localApplications.push({ - name: "Chrome", - uniqueId: res.data[i].unique_id - }); - } } xmlStrings.push(""); @@ -176,6 +178,9 @@ var getMyApplications = function() { .setContentType("application/x-www-form-urlencoded") .setBearerAuth(token) .setUseCache(false) + .setParameters({ + "filter[created_by][eq]": userId + }) .get(apiUrl + "/netsolid/items/applications", onSuccess) ; }; @@ -190,7 +195,6 @@ var getMyServers = function(assignedServers) { entry.find("a.title").text(res.data[i].ipaddress); entry.find("div.description").text(res.data[i].name); entry.appendTo("#listview_servers"); - servers.push({ "data": res.data[i], "entry": entry @@ -205,6 +209,9 @@ var getMyServers = function(assignedServers) { .setContentType("application/x-www-form-urlencoded") .setBearerAuth(token) .setUseCache(false) + .setParameters({ + "limit": "-1" + }) .get(apiUrl + "/netsolid/items/servers", onSuccess) ; @@ -230,6 +237,9 @@ var getAssignedServers = function() { .setContentType("application/x-www-form-urlencoded") .setBearerAuth(token) .setUseCache(false) + .setParameters({ + "filter[assigned_to][eq]": userId + }) .get(apiUrl + "/netsolid/items/assignedservers", onSuccess) ; }; diff --git a/app/style.css b/app/style.css index a48520c..ee901b6 100644 --- a/app/style.css +++ b/app/style.css @@ -15,7 +15,7 @@ input, textarea { #app { width: 100%; height: 100%; - overflow: hidden; + overflow: auto; } #loading { diff --git a/lib/http.js b/lib/http.js index 1884755..e305e46 100644 --- a/lib/http.js +++ b/lib/http.js @@ -292,7 +292,7 @@ var HTTPObject = function() { return this.jqAjax({ type: "GET", headers: this.headers, - url: url, + url: this.serializeParameters(url), data: this.requestBody, contentType: this.contentType, success: callback, @@ -315,7 +315,7 @@ var HTTPObject = function() { return this.jqAjax({ type: "PATCH", headers: this.headers, - url: url, + url: this.serializeParameters(url), data: this.requestBody, contentType: this.contentType, success: callback,