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 3f1aba8
Date Tue, 08 Oct 2013 18:48:52 GMT
Updated Branches:
  refs/heads/master 10938612c -> 3f1aba894


CLOUDSTACK-3888: UI > service offerings > compute offerings > add new field "Planner
Mode".


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

Branch: refs/heads/master
Commit: 3f1aba894f0e57ca45ce34857eb8d13d291a831b
Parents: 1093861
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Oct 8 11:46:39 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Oct 8 11:48:42 2013 -0700

----------------------------------------------------------------------
 ui/scripts/configuration.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f1aba89/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 5eff5b4..e76caaf 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -529,7 +529,10 @@
                                     },
                                     deploymentplanner: {
                                         label: 'Deployment Planner'
-                                    },
+                                    },                                    
+                                    plannerMode: {
+                                        label: 'Planner Mode'
+                                    },                                    
                                     tags: {
                                         label: 'label.storage.tags'
                                     },
@@ -556,6 +559,13 @@
                                         async: true,
                                         success: function(json) {
                                             var item = json.listserviceofferingsresponse.serviceoffering[0];
+                                            
+                                            if (item.deploymentplanner != null &&
item.serviceofferingdetails != null) {
+                                            	if (item.deploymentplanner == 'ImplicitDedicationPlanner'
&& item.serviceofferingdetails.ImplicitDedicationMode != null) {
+                                            		item.plannerMode = item.serviceofferingdetails.ImplicitDedicationMode;
+                                            	}
+                                            }
+                                                                                       
                                             args.response.success({
                                                 actionFitler: serviceOfferingActionfilter,
                                                 data: item


Mime
View raw message