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

Revert "bug 10410:" 

This reverts commit 5eed2e9cb246ce526203df3a39cef2be991ccc6e.
This commit is contained in:
anthony 2011-06-27 15:48:36 -07:00
parent bec24d533d
commit 3f62723bb9
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -126,8 +126,6 @@ public class ListIsosCmd extends BaseListCmd {
}
public boolean listInReadyState() {
return true;
/*
Account account = UserContext.current().getCaller();
// It is account specific if account is admin type and domainId and accountName are not null
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
@ -136,7 +134,6 @@ public class ListIsosCmd extends BaseListCmd {
boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
|| (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
return onlyReady;
*/
}
/////////////////////////////////////////////////////
@ -174,7 +171,7 @@ public class ListIsosCmd extends BaseListCmd {
isAdmin = true;
}
ListResponse<TemplateResponse> response = _responseGenerator.createIsoResponse(isoZonePairSet, isAdmin, account, bootable, true);
ListResponse<TemplateResponse> response = _responseGenerator.createIsoResponse(isoZonePairSet, isAdmin, account, bootable, listInReadyState());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}

5
api/src/com/cloud/api/commands/ListTemplatesCmd.java
View File

@ -107,8 +107,6 @@ public class ListTemplatesCmd extends BaseListCmd {
}
public boolean listInReadyState() {
return true;
/*
Account account = UserContext.current().getCaller();
// It is account specific if account is admin type and domainId and accountName are not null
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
@ -117,7 +115,6 @@ public class ListTemplatesCmd extends BaseListCmd {
boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
|| (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
return onlyReady;
*/
}
/////////////////////////////////////////////////////
@ -147,7 +144,7 @@ public class ListTemplatesCmd extends BaseListCmd {
List<TemplateResponse> templateResponses = new ArrayList<TemplateResponse>();
for (Pair<Long, Long> template : templateZonePairSet) {
_responseGenerator.createTemplateResponse(templateResponses, template, isAdmin, account, true);
_responseGenerator.createTemplateResponse(templateResponses, template, isAdmin, account, listInReadyState());
}
response.setResponses(templateResponses);