Skip to content
Snippets Groups Projects
Commit acfe0dd6 authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Merge branch 'feature/textarea-input' into 'develop'

Textarea inputs for welcome messages

See merge request !180
parents d6c0a9ff 5044edeb
No related branches found
No related tags found
1 merge request!180Textarea inputs for welcome messages
Pipeline #32701 passed
...@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ...@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Hide Tag actions on Users tab if MRF TagPolicy is disabled. Add ability to enable TagPolicy from Moderation menu - Hide Tag actions on Users tab if MRF TagPolicy is disabled. Add ability to enable TagPolicy from Moderation menu
- Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab - Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab
- Replace regular inputs with textareas for setting welcome messages in the Settings section
### Fixed ### Fixed
......
...@@ -41,6 +41,14 @@ ...@@ -41,6 +41,14 @@
:input-value="inputValue" :input-value="inputValue"
@change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)" @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"
/> />
<el-input
v-if="textareaInput"
:value="inputValue"
:placeholder="setting.suggestions ? setting.suggestions[0] : null"
:data-search="setting.key || setting.group"
type="textarea"
class="input"
@input="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
<el-input <el-input
v-else-if="setting.type === 'string' || v-else-if="setting.type === 'string' ||
(Array.isArray(setting.type) && setting.type.includes('string') && setting.type.includes('atom'))" (Array.isArray(setting.type) && setting.type.includes('string') && setting.type.includes('atom'))"
...@@ -292,6 +300,9 @@ export default { ...@@ -292,6 +300,9 @@ export default {
settings() { settings() {
return this.$store.state.settings.settings return this.$store.state.settings.settings
}, },
textareaInput() {
return this.settingGroup.key === ':welcome' && this.setting.key === ':message'
},
updatedSettings() { updatedSettings() {
return this.$store.state.settings.updatedSettings return this.$store.state.settings.updatedSettings
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment