You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/10/31 23:27:30 UTC
git commit: CS-16573: cloudstack UI - compute offering page - encode
data passed to API call.
Updated Branches:
refs/heads/master b2656b5ce -> ab4f70793
CS-16573: cloudstack UI - compute offering page - encode data passed to API call.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ab4f7079
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ab4f7079
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ab4f7079
Branch: refs/heads/master
Commit: ab4f7079362eea02a8e681e751684033e92c947c
Parents: b2656b5
Author: Jessica Wang <je...@citrix.com>
Authored: Tue Oct 30 16:23:57 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Wed Oct 31 15:27:16 2012 -0700
----------------------------------------------------------------------
ui/scripts/configuration.js | 118 ++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab4f7079/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 6b41cb9..a4ba018 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -161,34 +161,51 @@
},
action: function(args) {
- var array1 = [];
- array1.push("&name=" + args.data.name);
- array1.push("&displaytext=" + todb(args.data.description));
- array1.push("&storageType=" + todb(args.data.storageType));
- array1.push("&cpuNumber=" + args.data.cpuNumber);
- array1.push("&cpuSpeed="+ args.data.cpuSpeed);
- array1.push("&memory=" + args.data.memory);
-
- if(args.data.networkRate != null && args.data.networkRate.length > 0)
- array1.push("&networkrate=" + args.data.networkRate);
-
- array1.push("&offerha=" + (args.data.offerHA == "on"));
-
- if(args.data.storageTags != null && args.data.storageTags.length > 0)
- array1.push("&tags=" + todb(args.data.storageTags));
-
- if(args.data.hostTags != null && args.data.hostTags.length > 0)
- array1.push("&hosttags=" + todb(args.data.hostTags));
-
- array1.push("&limitcpuuse=" + (args.data.cpuCap == "on"));
+ var data = {
+ issystem: false,
+ name: args.data.name,
+ displaytext: args.data.description,
+ storageType: args.data.storageType,
+ cpuNumber: args.data.cpuNumber,
+ cpuSpeed: args.data.cpuSpeed,
+ memory: args.data.memory
+ };
+
+ if(args.data.networkRate != null && args.data.networkRate.length > 0) {
+ $.extend(data, {
+ networkrate: args.data.networkRate
+ });
+ }
- if(args.$form.find('.form-item[rel=domainId]').css("display") != "none")
- array1.push("&domainid=" + args.data.domainId);
+ $.extend(data, {
+ offerha: (args.data.offerHA == "on")
+ });
+
+ if(args.data.storageTags != null && args.data.storageTags.length > 0) {
+ $.extend(data, {
+ tags: args.data.storageTags
+ });
+ }
+
+ if(args.data.hostTags != null && args.data.hostTags.length > 0) {
+ $.extend(data, {
+ hosttags: args.data.hostTags
+ });
+ }
+
+ $.extend(data, {
+ limitcpuuse: (args.data.cpuCap == "on")
+ });
+
+ if(args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
+ $.extend(data, {
+ domainid: args.data.domainId
+ });
+ }
$.ajax({
- url: createURL("createServiceOffering&issystem=false"+array1.join("")),
- dataType: "json",
- async: true,
+ url: createURL('createServiceOffering'),
+ data: data,
success: function(json) {
var item = json.createserviceofferingresponse.serviceoffering;
args.response.success({data: item});
@@ -208,22 +225,16 @@
},
dataProvider: function(args) {
- var array1 = [];
- if(args.filterBy != null) {
- if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
- switch(args.filterBy.search.by) {
- case "name":
- if(args.filterBy.search.value.length > 0)
- array1.push("&keyword=" + args.filterBy.search.value);
- break;
- }
- }
- }
+ var data = {};
+ listViewDataProvider(args, data);
+
+ $.extend(data, {
+ issystem: false
+ });
$.ajax({
- url: createURL("listServiceOfferings&issystem=false&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
- dataType: "json",
- async: true,
+ url: createURL('listServiceOfferings'),
+ data: data,
success: function(json) {
var items = json.listserviceofferingsresponse.serviceoffering;
args.response.success({
@@ -243,12 +254,14 @@
edit: {
label: 'label.edit',
action: function(args) {
- var array1 = [];
- array1.push("&name=" + todb(args.data.name));
- array1.push("&displaytext=" + todb(args.data.displaytext));
+ var data = {
+ id: args.context.serviceOfferings[0].id,
+ name: args.data.name,
+ displaytext: args.data.displaytext
+ };
$.ajax({
- url: createURL("updateServiceOffering&id=" + args.context.serviceOfferings[0].id + array1.join("")),
- dataType: "json",
+ url: createURL('updateServiceOffering'),
+ data: data,
success: function(json) {
var item = json.updateserviceofferingresponse.serviceoffering;
args.response.success({data: item});
@@ -271,9 +284,12 @@
}
},
action: function(args) {
+ var data = {
+ id: args.context.serviceOfferings[0].id
+ };
$.ajax({
- url: createURL("deleteServiceOffering&id=" + args.context.serviceOfferings[0].id),
- dataType: "json",
+ url: createURL('deleteServiceOffering'),
+ data: data,
async: true,
success: function(json) {
args.response.success();
@@ -340,10 +356,14 @@
}
],
- dataProvider: function(args) {
+ dataProvider: function(args) {
+ var data = {
+ issystem: false,
+ id: args.context.serviceOfferings[0].id
+ };
$.ajax({
- url: createURL("listServiceOfferings&issystem=false&id=" + args.context.serviceOfferings[0].id),
- dataType: "json",
+ url: createURL('listServiceOfferings'),
+ data: data,
async: true,
success: function(json) {
var item = json.listserviceofferingsresponse.serviceoffering[0];