cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [08/50] git commit: updated refs/heads/4.4 to d5220a8
Date Mon, 28 Jul 2014 14:04:20 GMT
CLOUDSTACK-6852: UI - attach volume action - VM dropdown - populate options based on whether
module is included and whether service is enabled.

(cherry picked from commit 9b9154132dbd41acddf4365779fc8af13a2acc4c)


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

Branch: refs/heads/4.4
Commit: c9d4395bba3dfe15992464808e124395208644f0
Parents: f769763
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Jun 5 13:44:57 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 16:02:26 2014 +0200

----------------------------------------------------------------------
 ui/scripts/storage.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9d4395b/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 74d0201..7c19d66 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -905,6 +905,14 @@
                                                     });
                                                 }
 
+                                              
+                                                var drModuleIncluded = isModuleIncluded("dr");
+                                                var volumeDrEnabled = false;            
                                  
+                                                if (drModuleIncluded) {
+                                                    volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]);
                                                   
+                                                }    
+                                                
+                                                
                                                 $(['Running', 'Stopped']).each(function()
{
                                                     $.ajax({
                                                         url: createURL('listVirtualMachines'),
@@ -914,11 +922,21 @@
                                                         async: false,
                                                         success: function(json) {
                                                             var instanceObjs = json.listvirtualmachinesresponse.virtualmachine;
-                                                            $(instanceObjs).each(function()
{
-                                                                items.push({
-                                                                    id: this.id,
-                                                                    description: this.displayname
? this.displayname : this.name
-                                                                });
+                                                            $(instanceObjs).each(function()
{                                                               
+                                                                if (drModuleIncluded) {
+                                                                    var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this);
+                                                                    if (vmDrEnabled == volumeDrEnabled)
{
+                                                                        items.push({
+                                                                            id: this.id,
+                                                                            description:
this.displayname ? this.displayname : this.name
+                                                                        });
+                                                                    } 
+                                                                } else {
+                                                                    items.push({
+                                                                        id: this.id,
+                                                                        description: this.displayname
? this.displayname : this.name
+                                                                    });
+                                                                }                       
                                        
                                                             });
                                                         }
                                                     });
@@ -1993,7 +2011,7 @@
         }
 
         if (jsonObj.state != "Creating") {
-            if (jsonObj.type == "ROOT") {
+            if (jsonObj.type == "ROOT") {                
                 if (jsonObj.vmstate == "Stopped") {
                     allowedActions.push("createTemplate");
                 }


Mime
View raw message