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:29:15 UTC
git commit: updated refs/heads/4.4-forward to d991e37
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward c29ed73d4 -> d991e3786
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/d991e378
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d991e378
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d991e378
Branch: refs/heads/4.4-forward
Commit: d991e37865106e79a6a31e4af3a34b2446058eef
Parents: c29ed73
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:29:04 2014 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d991e378/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 + ")";