etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

This commit is contained in:
erikbocks 2026-03-20 06:58:19 -03:00
parent b4bbf30a20
commit b1ef786590
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/config/section/offering.js
View File

@ -43,7 +43,7 @@ export default {
}
return []
},
columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'gpu', 'domain', 'zone', 'order'],
details: () => {
var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'gpucardid', 'gpucardname', 'vgpuprofileid', 'vgpuprofilename', 'gpucount', 'gpudisplay', 'leaseexpiryaction', 'externaldetails']
if (store.getters.apis.createServiceOffering &&
@ -429,7 +429,7 @@ export default {
name: 'networkoffering',
title: 'label.network.offerings',
icon: 'wifi-outlined',
docHelp: 'adminguide/networking.html#network-offerings',
docHelp: 'adminguide/networking.html#network-offerings ',
permission: ['listNetworkOfferings'],
filters: ['all', 'forvpc', 'guestnetwork'],
searchFilters: ['name', 'zoneid', 'domainid', 'guestiptype', 'tags'],