mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-6858: UI - remove obsolete variable rootAccountId whose value is no longer 1.
This commit is contained in:
parent
a8a853e322
commit
ea196a4ffc
@ -51,8 +51,6 @@ var pageSize = 20;
|
|||||||
|
|
||||||
var drModuleIncluded = false;
|
var drModuleIncluded = false;
|
||||||
|
|
||||||
var rootAccountId = 1;
|
|
||||||
|
|
||||||
//async action
|
//async action
|
||||||
var pollAsyncJobResult = function(args) {
|
var pollAsyncJobResult = function(args) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -1183,10 +1181,7 @@ var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
|
|||||||
jsonObj.networkofferingidText = jsonObj.networkofferingid;
|
jsonObj.networkofferingidText = jsonObj.networkofferingid;
|
||||||
|
|
||||||
if (jsonObj.acltype == "Domain") {
|
if (jsonObj.acltype == "Domain") {
|
||||||
if (jsonObj.domainid == rootAccountId)
|
jsonObj.scope = "Domain (" + jsonObj.domain + ")";
|
||||||
jsonObj.scope = "All";
|
|
||||||
else
|
|
||||||
jsonObj.scope = "Domain (" + jsonObj.domain + ")";
|
|
||||||
} else if (jsonObj.acltype == "Account") {
|
} else if (jsonObj.acltype == "Account") {
|
||||||
if (jsonObj.project != null)
|
if (jsonObj.project != null)
|
||||||
jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.project + ")";
|
jsonObj.scope = "Account (" + jsonObj.domain + ", " + jsonObj.project + ")";
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user