[cloudstack] branch 4.18 updated: UI: Show iso urls (#7869)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 19aacad46bb UI: Show iso urls (#7869)
19aacad46bb is described below

commit 19aacad46bb0d58e5d42e56067eddf1f07e0016e
Author: dahn <d...@onecht.net>
AuthorDate: Tue Aug 15 13:51:53 2023 +0200

    UI: Show iso urls (#7869)
    
    * add url to details
    
    * some cleanup
---
 server/src/main/java/com/cloud/api/query/QueryManagerImpl.java   | 8 ++++----
 server/src/main/java/com/cloud/api/query/ViewResponseHelper.java | 2 +-
 ui/src/config/section/image.js                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 74367a09c53..c28865943a9 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -3940,7 +3940,7 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
     @Override
     public ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd) {
         Pair<List<TemplateJoinVO>, Integer> result = 
searchForIsosInternal(cmd);
-        ListResponse<TemplateResponse> response = new 
ListResponse<TemplateResponse>();
+        ListResponse<TemplateResponse> response = new ListResponse<>();
 
         ResponseView respView = ResponseView.Restricted;
         if (cmd instanceof ListIsosCmdByAdmin) {
@@ -3967,11 +3967,11 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
             listAll = true;
         }
 
-        List<Long> permittedAccountIds = new ArrayList<Long>();
-        Ternary<Long, Boolean, ListProjectResourcesCriteria> 
domainIdRecursiveListProject = new Ternary<Long, Boolean, 
ListProjectResourcesCriteria>(cmd.getDomainId(), cmd.isRecursive(), null);
+        List<Long> permittedAccountIds = new ArrayList<>();
+        Ternary<Long, Boolean, ListProjectResourcesCriteria> 
domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), 
cmd.isRecursive(), null);
         _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), 
cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject, listAll, 
false);
         ListProjectResourcesCriteria listProjectResourcesCriteria = 
domainIdRecursiveListProject.third();
-        List<Account> permittedAccounts = new ArrayList<Account>();
+        List<Account> permittedAccounts = new ArrayList<>();
         for (Long accountId : permittedAccountIds) {
             permittedAccounts.add(_accountMgr.getAccount(accountId));
         }
diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java 
b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
index ecfda39972e..8fd42ea3c41 100644
--- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
@@ -610,7 +610,7 @@ public class ViewResponseHelper {
     }
 
     public static List<TemplateResponse> createIsoResponse(ResponseView view, 
TemplateJoinVO... templates) {
-        Hashtable<String, TemplateResponse> vrDataList = new Hashtable<String, 
TemplateResponse>();
+        Hashtable<String, TemplateResponse> vrDataList = new Hashtable<>();
         for (TemplateJoinVO vr : templates) {
             TemplateResponse vrData = vrDataList.get(vr.getTempZonePair());
             if (vrData == null) {
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js
index bf1083575dd..c41ab9307a6 100644
--- a/ui/src/config/section/image.js
+++ b/ui/src/config/section/image.js
@@ -213,7 +213,7 @@ export default {
         }
         return fields
       },
-      details: ['name', 'id', 'displaytext', 'checksum', 'ostypename', 'size', 
'bootable', 'isready', 'directdownload', 'isextractable', 'ispublic', 
'isfeatured', 'crosszones', 'account', 'domain', 'created', 'userdatadetails', 
'userdatapolicy'],
+      details: ['name', 'id', 'displaytext', 'checksum', 'ostypename', 'size', 
'bootable', 'isready', 'directdownload', 'isextractable', 'ispublic', 
'isfeatured', 'crosszones', 'account', 'domain', 'created', 'userdatadetails', 
'userdatapolicy', 'url'],
       searchFilters: ['name', 'zoneid', 'tags'],
       related: [{
         name: 'vm',