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 <jessicaw...@apache.org> Authored: Fri Jun 6 13:26:53 2014 -0700 Committer: Jessica Wang <jessicaw...@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 + ")";
