etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6858: UI - remove obsolete variable rootAccountId whose value is no longer 1. 

(cherry picked from commit d991e37865)
This commit is contained in:
Jessica Wang 2014-06-06 13:26:53 -07:00 committed by Daan Hoogland
parent 4b2756ab9c
commit 8a58bd3fed
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/scripts/sharedFunctions.js
View File

@ -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 + ")";