cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 8ece25c
Date Thu, 30 May 2013 23:32:02 GMT
Updated Branches:
  refs/heads/master da53ef1ae -> 8ece25c1f


CLOUDSTACK-681: deployment planner - create compute offering dialog - deployment planner dropdown
- add blank option and make it as default option. Not pass anything to API call when blank
option is selected.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ece25c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ece25c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ece25c1

Branch: refs/heads/master
Commit: 8ece25c1f2bd6d0126c2a22b42e1c4da65fc2856
Parents: da53ef1
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu May 30 16:27:36 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu May 30 16:27:36 2013 -0700

----------------------------------------------------------------------
 ui/scripts/configuration.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ece25c1/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 43dd68f..8a4aa7d 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -151,7 +151,7 @@
                            url:createURL('listDeploymentPlanners'),
                            dataType:'json',
                            success:function(json){
-                              var items=[];
+                              var items=[{id: '', description: ''}];
                                var plannerObjs = json.listdeploymentplannersresponse.deploymentPlanner;
                           $(plannerObjs).each(function(){
                             items.push({id: this.name, description: this.name});
@@ -208,10 +208,15 @@
 									storageType: args.data.storageType,
 									cpuNumber: args.data.cpuNumber,
 									cpuSpeed: args.data.cpuSpeed,
-									memory: args.data.memory,
-                                                                        deploymentplanner:
args.data.deploymentPlanner
-
-								};															
+									memory: args.data.memory 
+								};	
+                
+                if(args.data.deploymentPlanner != null && args.data.deploymentPlanner.length
> 0) {
+                  $.extend(data, {
+                    deploymentplanner: args.data.deploymentPlanner
+                  });
+                }
+                
                 var array1 =[];
                    if(args.data.deploymentPlanner == "ImplicitDedicationPlanner" &&
args.data.plannerMode != ""){
                        array1.push("&serviceofferingdetails[0].ImplicitDedicationMode"
+  "=" + args.data.plannerMode);


Mime
View raw message