You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/06/06 22:30:39 UTC
[1/2] git commit: updated refs/heads/master to ea196a4
Repository: cloudstack
Updated Branches:
refs/heads/master 2459f55c2 -> ea196a4ff
CLOUDSTACK-6852: UI - modules - add global variable drModuleIncluded.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a8a853e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8a853e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8a853e3
Branch: refs/heads/master
Commit: a8a853e32250e2ec384dd432931658b430aa77cd
Parents: 2459f55
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jun 6 13:16:27 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jun 6 13:29:53 2014 -0700
----------------------------------------------------------------------
ui/scripts/cloudStack.js | 3 +++
ui/scripts/sharedFunctions.js | 2 ++
ui/scripts/storage.js | 3 ---
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8a853e3/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/a8a853e3/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/a8a853e3/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 32a6a7e..6f35452 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -901,14 +901,11 @@
});
}
-
- 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'),
[2/2] git commit: updated refs/heads/master to ea196a4
Posted by je...@apache.org.
CLOUDSTACK-6858: UI - remove obsolete variable rootAccountId whose value is no longer 1.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea196a4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea196a4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea196a4f
Branch: refs/heads/master
Commit: ea196a4ffcf9de33f8486dfbddc08e0040b8bb2c
Parents: a8a853e
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jun 6 13:26:53 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jun 6 13:30:13 2014 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea196a4f/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index bec0336..445351a 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -51,8 +51,6 @@ var pageSize = 20;
var drModuleIncluded = false;
-var rootAccountId = 1;
-
//async action
var pollAsyncJobResult = function(args) {
$.ajax({
@@ -1183,10 +1181,7 @@ var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
jsonObj.networkofferingidText = jsonObj.networkofferingid;
if (jsonObj.acltype == "Domain") {
- if (jsonObj.domainid == rootAccountId)
- jsonObj.scope = "All";
- else
- jsonObj.scope = "Domain (" + jsonObj.domain + ")";
+ jsonObj.scope = "Domain (" + jsonObj.domain + ")";
} else if (jsonObj.acltype == "Account") {
if (jsonObj.project != null)
jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.project + ")";