Merge branch 'fix/show-features-panel-not-working' into 'develop'

#322 Fix showFeaturesPanel option as instance

See merge request pleroma/pleroma-fe!552
This commit is contained in:
feld 2019-02-08 21:27:58 +00:00
commit 9768558e7c
6 changed files with 6 additions and 4 deletions

View file

@ -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 () {

View file

@ -87,6 +87,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('postContentType')
copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks')
copyInstanceOption('showFeaturesPanel')
if ((config.chatDisabled)) {
store.dispatch('disableChat')

View file

@ -9,7 +9,7 @@ const About = {
TermsOfServicePanel
},
computed: {
showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
}
}

View file

@ -31,7 +31,6 @@ const defaultState = {
scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default
alwaysShowSubjectInput: undefined, // instance default
showFeaturesPanel: true,
postContentType: undefined // instance default
}

View file

@ -29,6 +29,7 @@ const defaultState = {
nsfwCensorImage: undefined,
vapidPublicKey: undefined,
noAttachmentLinks: false,
showFeaturesPanel: true,
// Nasty stuff
pleromaBackend: true,

View file

@ -20,5 +20,6 @@
"loginMethod": "password",
"webPushNotifications": false,
"noAttachmentLinks": false,
"nsfwCensorImage": ""
"nsfwCensorImage": "",
"showFeaturesPanel": true
}