diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index 9d7b743a70aa..6ab9d38174e7 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -32,13 +32,17 @@ export default { permission: ['listServiceOfferings'], searchFilters: ['name', 'gpuenabled', 'zoneid', 'domainid', 'cpunumber', 'cpuspeed', 'memory'], params: () => { - var params = {} if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) { - params = { isrecursive: 'true' } + return { isrecursive: 'true' } } - return params + return { state: 'Active' } + }, + filters: () => { + if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) { + return ['active', 'inactive'] + } + return [] }, - filters: ['active', 'inactive'], 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'] @@ -425,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'], diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index f4aa842d8f2b..56e410cfae37 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -1172,6 +1172,10 @@ export default { delete params.listall } + if (!['Admin', 'DomainAdmin'].includes(this.$store.getters.userInfo.roletype) && ['computeoffering'].includes(this.routeName)) { + delete params.state + } + callAPI(this.apiName, params).then(json => { var responseName var objectName