mirror of https://github.com/apache/cloudstack.git
Merge branch '4.17'
This commit is contained in:
commit
e20a57dc13
|
|
@ -154,7 +154,7 @@ export default {
|
|||
docHelp: 'adminguide/projects.html#suspending-or-deleting-a-project',
|
||||
dataView: true,
|
||||
show: (record, store) => {
|
||||
return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) || record.isCurrentUserProjectAdmin
|
||||
return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) || record.isCurrentUserProjectAdmin) && record.id !== store.project.id
|
||||
},
|
||||
groupAction: true,
|
||||
popup: true,
|
||||
|
|
|
|||
|
|
@ -320,11 +320,6 @@
|
|||
<a-select
|
||||
mode="tags"
|
||||
v-model:value="selectedTags"
|
||||
showSearch
|
||||
optionFilterProp="label"
|
||||
:filterOption="(input, option) => {
|
||||
return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
||||
}"
|
||||
:placeholder="apiParams.tags.description">
|
||||
<a-select-option v-for="tag in storageTags" :key="tag.name">{{ tag.name }}</a-select-option>
|
||||
</a-select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue