sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'instance-specific-panel' into 'develop' 

Hide ISP option if instance has panel disabled

Closes #368

See merge request pleroma/pleroma-fe!592
This commit is contained in:
HJ 2019-02-17 21:27:58 +00:00
parent a842cadd15 c30dabbdd4
commit 962a33f887
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/settings/settings.js
View File

@ -91,7 +91,8 @@ const settings = {
}, },
currentSaveStateNotice () { currentSaveStateNotice () {
return this.$store.state.interface.settings.currentSaveStateNotice return this.$store.state.interface.settings.currentSaveStateNotice
} },
instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
}, },
watch: { watch: {
hideAttachmentsLocal (value) { hideAttachmentsLocal (value) {

2
src/components/settings/settings.vue
View File

@ -27,7 +27,7 @@
<li> <li>
<interface-language-switcher /> <interface-language-switcher />
</li> </li>
<li> <li v-if="instanceSpecificPanelPresent">
<input type="checkbox" id="hideISP" v-model="hideISPLocal"> <input type="checkbox" id="hideISP" v-model="hideISPLocal">
<label for="hideISP">{{$t('settings.hide_isp')}}</label> <label for="hideISP">{{$t('settings.hide_isp')}}</label>
</li> </li>