Repository: cloudstack Updated Branches: refs/heads/4.4-forward 60e462932 -> 508a966aa
CLOUDSTACK-6852: UI - modules - remove variable drModuleIncluded. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/508a966a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/508a966a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/508a966a Branch: refs/heads/4.4-forward Commit: 508a966aa1eb2d251cbf2f5374c3f5111e8541cd Parents: 60e4629 Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Jun 13 15:11:05 2014 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Jun 13 15:20:13 2014 -0700 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 5 +---- ui/scripts/sharedFunctions.js | 4 +--- ui/scripts/storage.js | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/508a966a/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index ad53a4a..2285276 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -489,9 +489,6 @@ }; } - document.title = _l('label.app.name'); - - // set value to global variable - drModuleIncluded = isModuleIncluded("dr"); + document.title = _l('label.app.name'); }); })(cloudStack, jQuery); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/508a966a/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 5672820..d79c6f5 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -49,8 +49,6 @@ var md5HashedLogin = false; var pageSize = 20; //var pageSize = 1; //for testing only -var drModuleIncluded = false; - //async action var pollAsyncJobResult = function(args) { $.ajax({ @@ -1176,7 +1174,7 @@ function listViewDataProvider(args, data, options) { } var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) { - if (drModuleIncluded) { + if (isModuleIncluded("dr")) { $.ajax({ url: createURL("listResourceDetails"), data: { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/508a966a/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 0a2d1dc..197ad71 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -906,7 +906,7 @@ } var volumeDrEnabled = false; - if (drModuleIncluded) { + if (isModuleIncluded("dr")) { volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]); } @@ -920,7 +920,7 @@ success: function(json) { var instanceObjs = json.listvirtualmachinesresponse.virtualmachine; $(instanceObjs).each(function() { - if (drModuleIncluded) { + if (isModuleIncluded("dr")) { var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this); if (vmDrEnabled == volumeDrEnabled) { items.push({
