Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E134BF488 for ; Thu, 30 May 2013 09:58:57 +0000 (UTC) Received: (qmail 66061 invoked by uid 500); 30 May 2013 09:58:57 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 65709 invoked by uid 500); 30 May 2013 09:58:56 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 65482 invoked by uid 99); 30 May 2013 09:58:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 May 2013 09:58:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 807D089DA6F; Thu, 30 May 2013 09:58:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pranavs@apache.org To: commits@cloudstack.apache.org Date: Thu, 30 May 2013 09:58:52 -0000 Message-Id: <9423765b858c4c55af9749302fcdcc70@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to ef86639 Updated Branches: refs/heads/master 0a5e3fa60 -> ef8663998 Implicit Dedication UI changes Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6cbd85f0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cbd85f0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cbd85f0 Branch: refs/heads/master Commit: 6cbd85f0957095c6c2762aee37f1e099dcaf4c03 Parents: 965c7b9 Author: Pranav Saxena Authored: Thu May 30 15:27:18 2013 +0530 Committer: Pranav Saxena Committed: Thu May 30 15:27:18 2013 +0530 ---------------------------------------------------------------------- ui/scripts/configuration.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cbd85f0/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 211d7b7..43dd68f 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -164,7 +164,7 @@ } }, - plannerKey:{label:'Planner Key' , docID:'helpImplicitPlannerKey'}, + // plannerKey:{label:'Planner Key' , docID:'helpImplicitPlannerKey'}, plannerMode:{ label:'Planner Mode', select:function(args){ @@ -213,9 +213,9 @@ }; var array1 =[]; - if(args.data.plannerMode != null && args.data.plannerKey !=""){ - array1.push("&serviceofferingdetails[0]." + args.data.plannerKey + "=" + args.data.plannerMode); - } + if(args.data.deploymentPlanner == "ImplicitDedicationPlanner" && args.data.plannerMode != ""){ + array1.push("&serviceofferingdetails[0].ImplicitDedicationMode" + "=" + args.data.plannerMode); + } if(args.data.networkRate != null && args.data.networkRate.length > 0) { $.extend(data, {