Repository: cloudstack Updated Branches: refs/heads/4.4-forward c7f5077ab -> 22f503aa2
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/22f503aa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22f503aa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22f503aa Branch: refs/heads/4.4-forward Commit: 22f503aa2b0b866bd10c41b8f886984451730c40 Parents: c7f5077 Author: Jessica Wang <jessicaw...@apache.org> Authored: Tue May 20 15:50:27 2014 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Tue May 20 15:50:27 2014 -0700 ---------------------------------------------------------------------- ui/scripts/configuration.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22f503aa/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 53cd0c3..3823109 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -507,21 +507,17 @@ }; //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 }); - } + } //custom fields (end) if (args.data.deploymentPlanner != null && args.data.deploymentPlanner.length > 0) { @@ -628,7 +624,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 }); @@ -1173,7 +1169,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 }); @@ -1732,7 +1728,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 }); @@ -1796,7 +1792,7 @@ }); } - if (args.$form.find('.form-item[rel=domainId]').css("display") != "none") { + if (args.data.isPublic != "on") { $.extend(data, { domainid: args.data.domainId });
