Merge release branch 4.18 to 4.19

* 4.18: list by displayname instead of name (#8503)
apache · Sep 18, 2024 · 89482a2 · 89482a2
2 parents cfbdeba + 2e9986c
commit 89482a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
@@ -47,7 +47,7 @@ export default {
         return filters
       },
       columns: () => {
-        const fields = ['name', 'state', 'ipaddress']
+        const fields = ['displayname', 'state', 'ipaddress']
         const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
           {
             memoryused: (record) => {
@@ -77,7 +77,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
+      searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
           'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',