summaryrefslogtreecommitdiffstats
path: root/apps/theming/src
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2022-10-19 17:13:15 +0200
committerGitHub <noreply@github.com>2022-10-19 17:13:15 +0200
commitbe892d2e283a0a939434650a0c9933308a2cc6bb (patch)
tree85f1ac03f25e55fec258749d67b35b6a2b97db83 /apps/theming/src
parentf116c8703982d6cd8407ca43f19e77b116041658 (diff)
parentd89da9b898ae25d7aadde7cf22063a487e7a8ace (diff)
downloadnextcloud-server-be892d2e283a0a939434650a0c9933308a2cc6bb.tar.gz
nextcloud-server-be892d2e283a0a939434650a0c9933308a2cc6bb.zip
Merge pull request #34576 from nextcloud/fix/user-theming-admin-overrride
Add admin user customization kill switch
Diffstat (limited to 'apps/theming/src')
-rw-r--r--apps/theming/src/UserThemes.vue17
1 files changed, 12 insertions, 5 deletions
diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue
index c65b19bed7e..4c92e75199d 100644
--- a/apps/theming/src/UserThemes.vue
+++ b/apps/theming/src/UserThemes.vue
@@ -64,11 +64,16 @@
<NcSettingsSection :title="t('theming', 'Background')"
class="background">
- <p>{{ t('theming', 'Set a custom background') }}</p>
- <BackgroundSettings class="background__grid"
- :background="background"
- :theming-default-background="themingDefaultBackground"
- @update:background="updateBackground" />
+ <template v-if="isUserThemingDisabled">
+ <p>{{ t('theming', 'Customization has been disabled by your administrator') }}</p>
+ </template>
+ <template v-else>
+ <p>{{ t('theming', 'Set a custom background') }}</p>
+ <BackgroundSettings class="background__grid"
+ :background="background"
+ :theming-default-background="themingDefaultBackground"
+ @update:background="updateBackground" />
+ </template>
</NcSettingsSection>
</section>
</template>
@@ -90,6 +95,7 @@ const shortcutsDisabled = loadState('theming', 'shortcutsDisabled', false)
const background = loadState('theming', 'background')
const themingDefaultBackground = loadState('theming', 'themingDefaultBackground')
const shippedBackgroundList = loadState('theming', 'shippedBackgrounds')
+const isUserThemingDisabled = loadState('theming', 'isUserThemingDisabled')
console.debug('Available themes', availableThemes)
@@ -109,6 +115,7 @@ export default {
shortcutsDisabled,
background,
themingDefaultBackground,
+ isUserThemingDisabled,
}
},