From 96f092a0a919b1abee6ff807c4e0ebc50d0a1728 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Tue, 20 May 2014 15:50:27 -0700
Subject: [PATCH] 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.

---
 ui/scripts/configuration.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 54c03e72465..e76e8d43b41 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
                                     });