From 20dbde5c829c882dfaba49b1178dba6cd595d053 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 21 Nov 2011 14:43:28 -0800 Subject: [PATCH] cloudStack 3.0 new UI - NaaS - fix a bug that dedicated parameter didnt' get to pass into API call. --- ui/scripts/system.js | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e3e97b9295b..a0f2d09decf 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -6237,17 +6237,16 @@ fields: { url.push("lbdevicecapacity=" + capacity); } - var dedicated = (args.data.dedicated == "on"); - if(dedicated != null && dedicated.length > 0) { - if(isQuestionMarkAdded == false) { - url.push("?"); - isQuestionMarkAdded = true; - } - else { - url.push("&"); - } - url.push("Lbdevicededicated=" + dedicated.toString()); + var dedicated = (args.data.dedicated == "on"); //boolean (true/false) + if(isQuestionMarkAdded == false) { + url.push("?"); + isQuestionMarkAdded = true; } + else { + url.push("&"); + } + url.push("Lbdevicededicated=" + dedicated.toString()); + array1.push("&url=" + todb(url.join(""))); //construct URL ends here @@ -6391,22 +6390,18 @@ fields: { else { url.push("&"); } - url.push("capacity=" + capacity); - //url.push("lbdevicecapacity=" + capacity); + url.push("capacity=" + capacity); } - var dedicated = (args.data.dedicated == "on"); - if(dedicated != null && dedicated.length > 0) { - if(isQuestionMarkAdded == false) { - url.push("?"); - isQuestionMarkAdded = true; - } - else { - url.push("&"); - } - url.push("dedicated=" + dedicated.toString()); - //url.push("Lbdevicededicated=" + dedicated.toString()); + var dedicated = (args.data.dedicated == "on"); //boolean (true/false) + if(isQuestionMarkAdded == false) { + url.push("?"); + isQuestionMarkAdded = true; } + else { + url.push("&"); + } + url.push("dedicated=" + dedicated.toString()); array1.push("&url=" + todb(url.join(""))); //construct URL ends here