diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-13 18:22:15 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-13 18:22:15 +0700 |
| commit | a8521fc8d99ee7ee5142e2c7c642eee0fc14ed93 (patch) | |
| tree | 53e98662ef34b8bccc845f627c125528c1c1436c /src/components/instance_specific_panel | |
| parent | b3455649c53034e01725977260e69cff59c47e87 (diff) | |
| parent | e443716bcd616ad61efae161624dd970841a935c (diff) | |
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
Diffstat (limited to 'src/components/instance_specific_panel')
| -rw-r--r-- | src/components/instance_specific_panel/instance_specific_panel.js | 3 | ||||
| -rw-r--r-- | src/components/instance_specific_panel/instance_specific_panel.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/instance_specific_panel/instance_specific_panel.js b/src/components/instance_specific_panel/instance_specific_panel.js index 09e3d055..9bb5e945 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.js +++ b/src/components/instance_specific_panel/instance_specific_panel.js @@ -2,6 +2,9 @@ const InstanceSpecificPanel = { computed: { instanceSpecificPanelContent () { return this.$store.state.instance.instanceSpecificPanelContent + }, + show () { + return !this.$store.state.config.hideISP } } } diff --git a/src/components/instance_specific_panel/instance_specific_panel.vue b/src/components/instance_specific_panel/instance_specific_panel.vue index ca8e00c0..a7b74667 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.vue +++ b/src/components/instance_specific_panel/instance_specific_panel.vue @@ -1,5 +1,5 @@ <template> - <div class="instance-specific-panel"> + <div v-if="show" class="instance-specific-panel"> <div class="panel panel-default"> <div class="panel-body"> <div v-html="instanceSpecificPanelContent"> |