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 E8F03DC61 for ; Thu, 23 May 2013 21:19:42 +0000 (UTC) Received: (qmail 33822 invoked by uid 500); 23 May 2013 21:19:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33742 invoked by uid 500); 23 May 2013 21:19:38 -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 32918 invoked by uid 99); 23 May 2013 21:19:37 -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, 23 May 2013 21:19:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E0E3561E2; Thu, 23 May 2013 21:19:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Thu, 23 May 2013 21:19:52 -0000 Message-Id: <0390120b9447480897afe648e9b58ff6@git.apache.org> In-Reply-To: <0201d785867e470d82ea6eec4af1c592@git.apache.org> References: <0201d785867e470d82ea6eec4af1c592@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] [abbrv] git commit: updated refs/heads/rbd-snap-clone to 2355a81 CLOUDSTACK-681:Implicit Dedication UI support Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/49e39e51 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49e39e51 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49e39e51 Branch: refs/heads/rbd-snap-clone Commit: 49e39e51f2bd39c1e5cd60389f4433d58f9415bc Parents: e31553a Author: Pranav Saxena Authored: Wed May 22 12:31:48 2013 +0530 Committer: Pranav Saxena Committed: Wed May 22 12:31:48 2013 +0530 ---------------------------------------------------------------------- ui/scripts/configuration.js | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49e39e51/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 92c3d00..8856d4b 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -144,6 +144,27 @@ }, + deploymentPlanner:{ + label:'Deployment Planner', + select:function(args){ + $.ajax({ + url:createURL('listDeploymentPlanners'), + dataType:'json', + success:function(json){ + var items=[]; + var plannerObjs = json.listdeploymentplannersresponse.deploymentPlanner; + $(plannerObjs).each(function(){ + items.push({id: this.name, description: this.name}); + }); + args.response.success({data: items}); + + + } + }); + } + }, + + domainId: { label: 'label.domain', docID: 'helpComputeOfferingDomain', @@ -176,7 +197,9 @@ storageType: args.data.storageType, cpuNumber: args.data.cpuNumber, cpuSpeed: args.data.cpuSpeed, - memory: args.data.memory + memory: args.data.memory, + deploymentplanner: args.data.deploymentPlanner + }; if(args.data.networkRate != null && args.data.networkRate.length > 0) { @@ -362,6 +385,7 @@ converter: cloudStack.converters.toBooleanText }, isvolatile:{ label:'Volatile' , converter: cloudStack.converters.toBooleanText }, + deploymentplanner:{label:'Deployment Planner'}, tags: { label: 'label.storage.tags' }, hosttags: { label: 'label.host.tags' }, domain: { label: 'label.domain' },