diff options
| author | Julien Veyssier <eneiluj@posteo.net> | 2020-10-20 12:36:41 +0200 |
|---|---|---|
| committer | npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com> | 2020-11-13 06:51:26 +0000 |
| commit | f5ef2d7d5897bb490f2a10792760f809a68e4c00 (patch) | |
| tree | 04dcf6c646b10405a799e6d793137052fd848e02 /apps/dashboard/src/helpers | |
| parent | 35be4fdb019da658a824f41dc4bf0f415c032cb8 (diff) | |
| download | nextcloud-server-f5ef2d7d5897bb490f2a10792760f809a68e4c00.tar.gz nextcloud-server-f5ef2d7d5897bb490f2a10792760f809a68e4c00.zip | |
override default dashboard background with theming one
fix getAppValue default value in theming app
fix cacheBuster value injection
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/dashboard/src/helpers')
| -rw-r--r-- | apps/dashboard/src/helpers/getBackgroundUrl.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/dashboard/src/helpers/getBackgroundUrl.js b/apps/dashboard/src/helpers/getBackgroundUrl.js index 6090786884c..3af48030534 100644 --- a/apps/dashboard/src/helpers/getBackgroundUrl.js +++ b/apps/dashboard/src/helpers/getBackgroundUrl.js @@ -23,8 +23,11 @@ import { generateUrl } from '@nextcloud/router' import prefixWithBaseUrl from './prefixWithBaseUrl' -export default (background, time = 0) => { +export default (background, time = 0, themingDefaultBackground = '') => { if (background === 'default') { + if (themingDefaultBackground && themingDefaultBackground !== 'backgroundColor') { + return generateUrl('/apps/theming/image/background') + '?v=' + window.OCA.Theming.cacheBuster + } if (window.OCA.Accessibility.theme === 'dark') { return prefixWithBaseUrl('eduardo-neves-pedra-azul.jpg') } |