cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject git commit: updated refs/heads/master to 49e39e5
Date Wed, 22 May 2013 07:02:33 GMT
Updated Branches:
  refs/heads/master e31553aff -> 49e39e51f


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/master
Commit: 49e39e51f2bd39c1e5cd60389f4433d58f9415bc
Parents: e31553a
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Wed May 22 12:31:48 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
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' },


Mime
View raw message