Merge branch '4.17'

This commit is contained in:
nvazquez 2022-06-08 13:19:58 -03:00
commit e20a57dc13
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 1 additions and 6 deletions

View File

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

View File

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