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 2014/05/21 00:51:45 UTC
git commit: updated refs/heads/master to 96f092a
Repository: cloudstack
Updated Branches:
refs/heads/master 326f6d04e -> 96f092a0a
CLOUDSTACK-6729: UI - create compute offering/create disk offering - determine whether to pass certain data to API comamnd upon isCustomized checkbox/isPublic checkbox's value.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96f092a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96f092a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96f092a0
Branch: refs/heads/master
Commit: 96f092a0a919b1abee6ff807c4e0ebc50d0a1728
Parents: 326f6d0
Author: Jessica Wang <je...@apache.org>
Authored: Tue May 20 15:50:27 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue May 20 15:51:35 2014 -0700
----------------------------------------------------------------------
ui/scripts/configuration.js | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96f092a0/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 54c03e7..e76e8d4 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -530,17 +530,13 @@
};
//custom fields (begin)
- if (args.$form.find('.form-item[rel=cpuNumber]').css("display") != "none") {
+ if (args.data.isCustomized != "on") {
$.extend(data, {
cpuNumber: args.data.cpuNumber
});
- }
- if (args.$form.find('.form-item[rel=cpuSpeed]').css("display") != "none") {
$.extend(data, {
cpuSpeed: args.data.cpuSpeed
});
- }
- if (args.$form.find('.form-item[rel=memory]').css("display") != "none") {
$.extend(data, {
memory: args.data.memory
});
@@ -651,7 +647,7 @@
isvolatile: (args.data.isVolatile == "on")
});
- if (args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
+ if (args.data.isPublic != "on") {
$.extend(data, {
domainid: args.data.domainId
});
@@ -1222,7 +1218,7 @@
limitcpuuse: (args.data.cpuCap == "on")
});
- if (args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
+ if (args.data.isPublic != "on") {
$.extend(data, {
domainid: args.data.domainId
});
@@ -1807,7 +1803,7 @@
customized: (args.data.isCustomized == "on")
};
- if (args.$form.find('.form-item[rel=disksize]').css("display") != "none") {
+ if (args.data.isCustomized != "on") {
$.extend(data, {
disksize: args.data.disksize
});
@@ -1871,7 +1867,7 @@
});
}
- if (args.$form.find('.form-item[rel=domainId]').css("display") != "none") {
+ if (args.data.isPublic != "on") {
$.extend(data, {
domainid: args.data.domainId
});