Merge release branch 4.18 to 4.19

* 4.18:
  list by displayname instead of name (#8503)
This commit is contained in:
Daan Hoogland 2024-09-18 17:30:14 +02:00
commit 89482a2583

View File

@ -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',