commit: 9768558e7c65f6a4a343d4a78b2297e4888cf77b
parent: da0a5535eb09f6637df921a8a5f951c295bedeac
Author: feld <feld@feld.me>
Date: Fri, 8 Feb 2019 21:27:58 +0000
Merge branch 'fix/show-features-panel-not-working' into 'develop'
#322 Fix showFeaturesPanel option as instance
See merge request pleroma/pleroma-fe!552
Diffstat:
6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/App.js b/src/App.js
@@ -82,7 +82,7 @@ export default {
unseenNotificationsCount () {
return this.unseenNotifications.length
},
- showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+ showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
},
methods: {
scrollToTop () {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -87,6 +87,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('postContentType')
copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks')
+ copyInstanceOption('showFeaturesPanel')
if ((config.chatDisabled)) {
store.dispatch('disableChat')
diff --git a/src/components/about/about.js b/src/components/about/about.js
@@ -9,7 +9,7 @@ const About = {
TermsOfServicePanel
},
computed: {
- showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
+ showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
}
}
diff --git a/src/modules/config.js b/src/modules/config.js
@@ -31,7 +31,6 @@ const defaultState = {
scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default
alwaysShowSubjectInput: undefined, // instance default
- showFeaturesPanel: true,
postContentType: undefined // instance default
}
diff --git a/src/modules/instance.js b/src/modules/instance.js
@@ -29,6 +29,7 @@ const defaultState = {
nsfwCensorImage: undefined,
vapidPublicKey: undefined,
noAttachmentLinks: false,
+ showFeaturesPanel: true,
// Nasty stuff
pleromaBackend: true,
diff --git a/static/config.json b/static/config.json
@@ -20,5 +20,6 @@
"loginMethod": "password",
"webPushNotifications": false,
"noAttachmentLinks": false,
- "nsfwCensorImage": ""
+ "nsfwCensorImage": "",
+ "showFeaturesPanel": true
}