cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [11/50] git commit: updated refs/heads/4.4 to d5220a8
Date Mon, 28 Jul 2014 14:04:23 GMT
CLOUDSTACK-6852: UI - modules - add global variable drModuleIncluded.

(cherry picked from commit c29ed73d4d36fbbd8e48cae4217c655d8024c7cc)


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

Branch: refs/heads/4.4
Commit: 4b2756ab9c836f1c16e6d0315017a3f195fb69af
Parents: c9d4395
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Jun 6 13:16:27 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 16:02:27 2014 +0200

----------------------------------------------------------------------
 ui/scripts/cloudStack.js      | 3 +++
 ui/scripts/sharedFunctions.js | 2 ++
 ui/scripts/storage.js         | 7 ++-----
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b2756ab/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index be7692d..ad53a4a 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -490,5 +490,8 @@
         }
 
         document.title = _l('label.app.name');
+               
+        // set value to global variable
+        drModuleIncluded = isModuleIncluded("dr");     
     });
 })(cloudStack, jQuery);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b2756ab/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index c51bc8d..bec0336 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -49,6 +49,8 @@ var md5HashedLogin = false;
 var pageSize = 20;
 //var pageSize = 1; //for testing only
 
+var drModuleIncluded = false;
+
 var rootAccountId = 1;
 
 //async action

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b2756ab/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 7c19d66..5a0580b 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -904,14 +904,11 @@
                                                         hypervisor: args.context.volumes[0].hypervisor
                                                     });
                                                 }
-
-                                              
-                                                var drModuleIncluded = isModuleIncluded("dr");
+                                                                                        
     
                                                 var volumeDrEnabled = false;            
                                  
                                                 if (drModuleIncluded) {
                                                     volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]);
                                                   
-                                                }    
-                                                
+                                                }   
                                                 
                                                 $(['Running', 'Stopped']).each(function()
{
                                                     $.ajax({


Mime
View raw message