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

Disable users from creating public templates based on global setting (#693) 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-09-11 15:44:35 +05:30 committed by Rohit Yadav
parent 160bb9e2de
commit de031faf99
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/config/section/image.js
View File

@ -104,7 +104,13 @@ export default {
icon: 'share-alt',
label: 'label.action.template.share',
dataView: true,
args: ['ispublic', 'isfeatured', 'isextractable'],
args: (record, store) => {
const fields = ['isfeatured', 'isextractable']
if (['Admin'].includes(store.userInfo.roletype) || store.features.userpublictemplateenabled) {
fields.unshift('ispublic')
}
return fields
},
show: (record, store) => {
return (['Admin'].includes(store.userInfo.roletype) || // If admin or owner or belongs to current project
(record.domainid === store.userInfo.domainid && record.account === store.userInfo.account) ||
@ -225,7 +231,13 @@ export default {
icon: 'share-alt',
label: 'label.action.iso.share',
dataView: true,
args: ['ispublic', 'isfeatured', 'isextractable'],
args: (record, store) => {
const fields = ['isfeatured', 'isextractable']
if (['Admin'].includes(store.userInfo.roletype) || store.features.userpublictemplateenabled) {
fields.unshift('ispublic')
}
return fields
},
show: (record, store) => {
return (['Admin'].includes(store.userInfo.roletype) || // If admin or owner or belongs to current project
(record.domainid === store.userInfo.domainid && record.account === store.userInfo.account) ||

4
ui/src/views/image/RegisterOrUploadIso.vue
View File

@ -131,7 +131,9 @@
}]" />
</a-form-item>
<a-form-item :label="$t('label.ispublic')">
<a-form-item
:label="$t('label.ispublic')"
v-if="$store.getters.userInfo.roletype === 'Admin' || $store.getters.features.userpublictemplateenabled" >
<a-switch
v-decorator="['ispublic', {
initialValue: false

10
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -339,8 +339,8 @@
</a-checkbox>
</a-col>
<a-col :span="12">
<a-checkbox value="ispublic">
{{ $t('label.ispublic') }}
<a-checkbox value="requireshvm">
{{ $t('label.requireshvm') }}
</a-checkbox>
</a-col>
</a-row>
@ -351,8 +351,10 @@
</a-checkbox>
</a-col>
<a-col :span="12">
<a-checkbox value="requireshvm">
{{ $t('label.requireshvm') }}
<a-checkbox
value="ispublic"
v-if="$store.getters.userInfo.roletype === 'Admin' || $store.getters.features.userpublictemplateenabled" >
{{ $t('label.ispublic') }}
</a-checkbox>
</a-col>
</a-row>