diff options
| author | HJ <spam@hjkos.com> | 2019-02-17 21:27:58 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2019-02-17 21:27:58 +0000 |
| commit | 962a33f887786dfdd2df57be66cd37b8ddb7d06d (patch) | |
| tree | c981b39a7c43e81b143707b903af60f0c47708fa | |
| parent | a842cadd155269d2a46bc3e342eda77e5fc4a773 (diff) | |
| parent | c30dabbdd4427f59929dc5ef08340620fdbe8f5d (diff) | |
Merge branch 'instance-specific-panel' into 'develop'
Hide ISP option if instance has panel disabled
Closes #368
See merge request pleroma/pleroma-fe!592
| -rw-r--r-- | src/components/settings/settings.js | 3 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 534a9839..23c1acdb 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -91,7 +91,8 @@ const settings = { }, currentSaveStateNotice () { return this.$store.state.interface.settings.currentSaveStateNotice - } + }, + instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel } }, watch: { hideAttachmentsLocal (value) { diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index dfb2e49d..e5f8fefb 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -27,7 +27,7 @@ <li> <interface-language-switcher /> </li> - <li> + <li v-if="instanceSpecificPanelPresent"> <input type="checkbox" id="hideISP" v-model="hideISPLocal"> <label for="hideISP">{{$t('settings.hide_isp')}}</label> </li> |