From b9f1c93f65c45c16b1c548442e35fee8113a0964 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 4 Aug 2020 03:02:32 +0300
Subject: [PATCH] Add :frontends settings on Frontend tab
---
CHANGELOG.md | 2 +-
src/views/settings/components/Frontend.vue | 10 ++++++++++
src/views/settings/components/tabs.js | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9857d58..8cb6ac99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add ability to disable multi-factor authentication for a user
- Add ability to manually evict and ban URLs from the Pleroma MediaProxy cache
- Add Invalidation settings on MediaProxy tab
-- Ability to configure S3 settings on Upload tab, Pleroma.Web.ApiSpec.CastAndValidate and :modules settings on Other tab, Pools, Connections pools and Hackney pools settings on Job Queue tab, :restrict_unauthenticated settings on Authentication tab, :favicons and :welcome settings on Instance tab
+- Ability to configure S3 settings on Upload tab, Pleroma.Web.ApiSpec.CastAndValidate and :modules settings on Other tab, Pools, Connections pools and Hackney pools settings on Job Queue tab, :restrict_unauthenticated settings on Authentication tab, :favicons and :welcome settings on Instance tab, :frontends settings on Frontend tab
- Show number of open reports in Sidebar Menu
- Add confirmation message when deleting a user
diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue
index 15d29084..ec3675b8 100644
--- a/src/views/settings/components/Frontend.vue
+++ b/src/views/settings/components/Frontend.vue
@@ -8,6 +8,10 @@
<setting :setting-group="staticFe" :data="staticFeData"/>
</el-form>
<el-divider v-if="staticFe" class="divider thick-line"/>
+ <el-form :model="frontendsData" :label-position="labelPosition" :label-width="labelWidth">
+ <setting :setting-group="frontends" :data="frontendsData"/>
+ </el-form>
+ <el-divider v-if="frontends" class="divider thick-line"/>
<el-form :model="assetsData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="assets" :data="assetsData"/>
</el-form>
@@ -66,6 +70,12 @@ export default {
frontendData() {
return _.get(this.settings.settings, [':pleroma', ':frontend_configurations']) || {}
},
+ frontends() {
+ return this.settings.description.find(setting => setting.key === ':frontends')
+ },
+ frontendsData() {
+ return _.get(this.settings.settings, [':pleroma', ':frontends']) || {}
+ },
isMobile() {
return this.$store.state.app.device === 'mobile'
},
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index 24f03b6f..011a16b8 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -18,7 +18,7 @@ export const tabs = description => {
},
'frontend': {
label: 'settings.frontend',
- settings: [':assets', ':chat', ':emoji', ':frontend_configurations', ':markup', ':static_fe']
+ settings: [':assets', ':chat', ':frontends', ':emoji', ':frontend_configurations', ':markup', ':static_fe']
},
'gopher': {
label: 'settings.gopher',
--
GitLab