From 6c359739078f834710432ac91298229a3ca92a16 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 22 Jun 2020 03:04:53 +0300
Subject: [PATCH] Fix managing Pleroma.Upload.Filter.Mogrify setting
---
src/views/settings/components/Inputs.vue | 3 +--
src/views/settings/components/Setting.vue | 2 +-
.../components/inputComponents/SpecificMultipleSelect.vue | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index 3214485f..4b630ffe 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -327,8 +327,7 @@ export default {
type.includes('module') ||
(type.includes('list') && type.includes('string')) ||
(type.includes('list') && type.includes('atom')) ||
- (type.includes('regex') && type.includes('string')) ||
- this.setting.key === ':args'
+ (type.includes('regex') && type.includes('string'))
)
},
renderSingleSelect(type) {
diff --git a/src/views/settings/components/Setting.vue b/src/views/settings/components/Setting.vue
index 2f99a3d1..28a68448 100644
--- a/src/views/settings/components/Setting.vue
+++ b/src/views/settings/components/Setting.vue
@@ -2,7 +2,7 @@
<div v-if="!loading">
<el-form-item v-if="settingGroup.label || settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container">
<span v-if="settingGroup.label" class="setting-label">{{ settingGroup.label }}</span>
- <span class="expl no-top-margin" v-html="getFormattedDescription(settingGroup.description)"/>
+ <span v-if="settingGroup.description" class="expl no-top-margin" v-html="getFormattedDescription(settingGroup.description)"/>
</el-form-item>
<div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'">
<div v-for="setting in settingGroup.children.filter(setting => !setting.group)" :key="setting.key">
diff --git a/src/views/settings/components/inputComponents/SpecificMultipleSelect.vue b/src/views/settings/components/inputComponents/SpecificMultipleSelect.vue
index 25df11a7..06f06436 100644
--- a/src/views/settings/components/inputComponents/SpecificMultipleSelect.vue
+++ b/src/views/settings/components/inputComponents/SpecificMultipleSelect.vue
@@ -16,6 +16,8 @@
:value="data[setting.key]"
:data-search="setting.key || setting.group"
multiple
+ filterable
+ allow-create
class="input"
@change="updateSetting($event, settingGroup.group, settingGroup.key, setting.key, setting.type)">
<el-option value="strip" label="strip"/>
--
GitLab