Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FB42D58C for ; Sat, 27 Oct 2012 10:02:39 +0000 (UTC) Received: (qmail 1596 invoked by uid 500); 27 Oct 2012 10:02:30 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 1160 invoked by uid 500); 27 Oct 2012 10:02:30 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 98786 invoked by uid 99); 27 Oct 2012 10:02:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2012 10:02:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47D4B501DC; Sat, 27 Oct 2012 10:02:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [13/49] git commit: CS-16605: cloudstack 3.0 UI - create network offering - Mode dropdown (side by side/inline) - do not pass capabilitytype=InlineMode to API call when "side by side" is selected. Only pass it when "inline" is selected. Message-Id: <20121027100226.47D4B501DC@tyr.zones.apache.org> Date: Sat, 27 Oct 2012 10:02:26 +0000 (UTC) CS-16605: cloudstack 3.0 UI - create network offering - Mode dropdown (side by side/inline) - do not pass capabilitytype=InlineMode to API call when "side by side" is selected. Only pass it when "inline" is selected. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d15dc1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d15dc1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d15dc1d Branch: refs/heads/marvin-parallel Commit: 7d15dc1d4dba908eb4a42d5d65bac2508881efc5 Parents: e6c3e59 Author: Jessica Wang Authored: Thu Oct 25 15:57:27 2012 -0700 Committer: Jessica Wang Committed: Thu Oct 25 15:59:54 2012 -0700 ---------------------------------------------------------------------- ui/scripts/configuration.js | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d15dc1d/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 7d1d1dd..6b41cb9 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1620,11 +1620,13 @@ inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on" serviceCapabilityIndex++; } - else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "F5BigIp")) { - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb'; - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'InlineMode'; - inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = value; - serviceCapabilityIndex++; + else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "F5BigIp")) { + if(value == 'true') { //CS-16605 do not pass parameter if value is 'false'(side by side) + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'InlineMode'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = value; + serviceCapabilityIndex++; + } } else if ((key == 'service.Lb.lbIsolationDropdown') && ("Lb" in serviceProviderMap)) { inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb';