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

bug 13669: template page, ISO page - delete action is not allowed when owner is system. [reviewed-by: Brian]

This commit is contained in:
Jessica Wang 2012-02-17 16:00:00 -08:00
parent d3d48f8e22
commit 5733c96041
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/templates.js
View File

@ -1220,7 +1220,7 @@
//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")) {
|| (jsonObj.account == "system")) {
//do nothing
}
else {
@ -1279,7 +1279,7 @@
//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")
|| (jsonObj.account == "system")
) {
//do nothing
}