From 9b0a1418ecbd69e1971210d4c6f4da1dee5884a0 Mon Sep 17 00:00:00 2001 From: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Date: Fri, 24 Dec 2021 12:44:50 +0530 Subject: [PATCH] Provision to sort ISOs from UI, and Updated Templates/ISOs API response to return in the order of sortkey (#5800) --- .../java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 7 +++++-- ui/src/config/section/image.js | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 3eaaf536902..fe00ef0d11d 100644 --- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -561,9 +561,12 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation(); } + + Filter searchFilter = new Filter(TemplateJoinVO.class, "sortKey", QueryService.SortKeyAscending.value(), null, null); + searchFilter.addOrderBy(TemplateJoinVO.class, "tempZonePair", true); + SearchCriteria sc = tmpltIdsSearch.create(); sc.setParameters("idsIN", ids); - return searchIncludingRemoved(sc, null, null, false); + return searchIncludingRemoved(sc, searchFilter, null, false); } - } diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js index 13f4d0bc387..0a4667efd60 100644 --- a/ui/src/config/section/image.js +++ b/ui/src/config/section/image.js @@ -194,6 +194,9 @@ export default { if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) { fields.push('account') } + if (['Admin'].includes(store.getters.userInfo.roletype)) { + fields.push('order') + } return fields }, details: ['name', 'id', 'displaytext', 'checksum', 'ostypename', 'size', 'bootable', 'isready', 'directdownload', 'isextractable', 'ispublic', 'isfeatured', 'crosszones', 'account', 'domain', 'created'],