etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2014-05-20 15:50:27 -07:00
parent 326f6d04ea
commit 96f092a0a9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/scripts/configuration.js
View File

@ -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
});