Skip to content

Commit 19aacad

Browse files
authored
UI: Show iso urls (#7869)
* add url to details * some cleanup
1 parent aa02d9b commit 19aacad

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3940,7 +3940,7 @@ private List<TemplateJoinVO> applyPublicTemplateRestriction(List<TemplateJoinVO>
39403940
@Override
39413941
public ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd) {
39423942
Pair<List<TemplateJoinVO>, Integer> result = searchForIsosInternal(cmd);
3943-
ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
3943+
ListResponse<TemplateResponse> response = new ListResponse<>();
39443944

39453945
ResponseView respView = ResponseView.Restricted;
39463946
if (cmd instanceof ListIsosCmdByAdmin) {
@@ -3967,11 +3967,11 @@ private Pair<List<TemplateJoinVO>, Integer> searchForIsosInternal(ListIsosCmd cm
39673967
listAll = true;
39683968
}
39693969

3970-
List<Long> permittedAccountIds = new ArrayList<Long>();
3971-
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(cmd.getDomainId(), cmd.isRecursive(), null);
3970+
List<Long> permittedAccountIds = new ArrayList<>();
3971+
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), cmd.isRecursive(), null);
39723972
_accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject, listAll, false);
39733973
ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
3974-
List<Account> permittedAccounts = new ArrayList<Account>();
3974+
List<Account> permittedAccounts = new ArrayList<>();
39753975
for (Long accountId : permittedAccountIds) {
39763976
permittedAccounts.add(_accountMgr.getAccount(accountId));
39773977
}

server/src/main/java/com/cloud/api/query/ViewResponseHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ public static List<TemplateResponse> createTemplateUpdateResponse(ResponseView v
610610
}
611611

612612
public static List<TemplateResponse> createIsoResponse(ResponseView view, TemplateJoinVO... templates) {
613-
Hashtable<String, TemplateResponse> vrDataList = new Hashtable<String, TemplateResponse>();
613+
Hashtable<String, TemplateResponse> vrDataList = new Hashtable<>();
614614
for (TemplateJoinVO vr : templates) {
615615
TemplateResponse vrData = vrDataList.get(vr.getTempZonePair());
616616
if (vrData == null) {

ui/src/config/section/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export default {
213213
}
214214
return fields
215215
},
216-
details: ['name', 'id', 'displaytext', 'checksum', 'ostypename', 'size', 'bootable', 'isready', 'directdownload', 'isextractable', 'ispublic', 'isfeatured', 'crosszones', 'account', 'domain', 'created', 'userdatadetails', 'userdatapolicy'],
216+
details: ['name', 'id', 'displaytext', 'checksum', 'ostypename', 'size', 'bootable', 'isready', 'directdownload', 'isextractable', 'ispublic', 'isfeatured', 'crosszones', 'account', 'domain', 'created', 'userdatadetails', 'userdatapolicy', 'url'],
217217
searchFilters: ['name', 'zoneid', 'tags'],
218218
related: [{
219219
name: 'vm',

0 commit comments

Comments
 (0)