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

bug 7539: Template page, ISO page - when isready == false, do not show Download Template/ISO option.

This commit is contained in:
Jessica Wang 2010-12-21 13:24:29 -08:00
parent 6b1e4d92ef
commit 676b2e74aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/cloud.core.iso.js
View File

@ -341,7 +341,7 @@ function isoJsonToDetailsTab() {
*/
// "Download ISO", "Delete ISO"
if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false && jsonObj.isostatus != null && jsonObj.isostatus.indexOf("% Downloaded") != -1)) {
if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false)) {
//do nothing
}
else {

2
ui/scripts/cloud.core.template.js
View File

@ -336,7 +336,7 @@ function templateJsonToDetailsTab() {
// "Download Template", "Delete Template"
if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)))
|| (jsonObj.isready == false && jsonObj.templatestatus != null && jsonObj.templatestatus.indexOf("% Downloaded") != -1) || jsonObj.templatetype == "SYSTEM") {
|| (jsonObj.isready == false) || jsonObj.templatetype == "SYSTEM") {
//do nothing
}
else {