diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index 564c4b7e69a..b53906add9e 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -446,7 +446,8 @@ function isoJsonToDetailsTab() { var noAvailableActions = true; // "Edit ISO", "Copy ISO" - if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) + //if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) + if ((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) //if neither root-admin, nor item owner || (jsonObj.isready == false) || (jsonObj.domainid == 1 && jsonObj.account == "system") ) { @@ -463,7 +464,8 @@ function isoJsonToDetailsTab() { // "Create VM" // Commenting this out for Beta2 as it does not support the new network. /* - if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) + //if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) + if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) //if neither root-admin, nor item owner || jsonObj.isready == false) || (jsonObj.bootable == false) || (jsonObj.domainid == 1 && jsonObj.account == "system") @@ -477,7 +479,8 @@ function isoJsonToDetailsTab() { */ // "Download ISO" - if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + //if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) //if neither root-admin, nor item owner || (jsonObj.isready == false) || (jsonObj.domainid == 1 && jsonObj.account == "system") ) { @@ -489,7 +492,8 @@ function isoJsonToDetailsTab() { } // "Delete ISO" - if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + //if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) //if neither root-admin, nor item owner || (jsonObj.isready == false && jsonObj.status != null && jsonObj.status.indexOf("Downloaded") != -1) || (jsonObj.domainid == 1 && jsonObj.account == "system") ) { diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index fab46a03c33..f6fa1069539 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -478,7 +478,9 @@ function templateJsonToDetailsTab() { var noAvailableActions = true; // "Edit Template", "Copy Template", "Create VM" - if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.templatetype == "SYSTEM" || jsonObj.isready == false) { + //if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) + if ((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) //if neither root-admin, nor item owner + || jsonObj.templatetype == "SYSTEM" || jsonObj.isready == false) { //do nothing } else { @@ -493,7 +495,8 @@ function templateJsonToDetailsTab() { } // "Download Template" - if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + //if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) //if neither root-admin, nor item owner || (jsonObj.isready == false) || jsonObj.templatetype == "SYSTEM") { //do nothing } @@ -503,7 +506,8 @@ function templateJsonToDetailsTab() { } // "Delete Template" - if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + //if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) + if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) //if neither root-admin, nor item owner || (jsonObj.isready == false && jsonObj.status != null && jsonObj.status.indexOf("Downloaded") != -1) || jsonObj.templatetype == "SYSTEM") { //do nothing