diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-08-18 11:57:01 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2020-08-19 17:07:28 +0200 |
| commit | 135ceb4a9de2238c1678577b5f3d34c6a9f66a8b (patch) | |
| tree | 8e7ad539861510ebd240d8da29ffb226d3ad5f45 | |
| parent | d02a92e870448c20d22d3ed1939c8d2e3edc6542 (diff) | |
| download | nextcloud-server-135ceb4a9de2238c1678577b5f3d34c6a9f66a8b.tar.gz nextcloud-server-135ceb4a9de2238c1678577b5f3d34c6a9f66a8b.zip | |
Fix late night errors
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/dashboard/lib/Service/BackgroundService.php | 2 | ||||
| -rw-r--r-- | apps/dashboard/src/components/BackgroundSettings.vue | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/dashboard/lib/Service/BackgroundService.php b/apps/dashboard/lib/Service/BackgroundService.php index 2b59bef65d9..30e9d9fe3cb 100644 --- a/apps/dashboard/lib/Service/BackgroundService.php +++ b/apps/dashboard/lib/Service/BackgroundService.php @@ -107,7 +107,7 @@ class BackgroundService { } public function setShippedBackground($fileName) { - if (!in_array($fileName, self::SHIPPED_BACKGROUNDS)) { + if (!array_key_exists($fileName, self::SHIPPED_BACKGROUNDS)) { throw new \InvalidArgumentException('The given file name is invalid'); } $this->config->setUserValue($this->userId, 'dashboard', 'background', $fileName); diff --git a/apps/dashboard/src/components/BackgroundSettings.vue b/apps/dashboard/src/components/BackgroundSettings.vue index accc094f523..65f70614d7b 100644 --- a/apps/dashboard/src/components/BackgroundSettings.vue +++ b/apps/dashboard/src/components/BackgroundSettings.vue @@ -95,6 +95,11 @@ export default { async update(data) { const background = data.type === 'custom' || data.type === 'default' ? data.type : data.value this.backgroundImage = getBackgroundUrl(background, data.version) + if (data.type === 'color') { + this.$emit('updateBackground', data) + this.loading = false + return + } const image = new Image() image.onload = () => { this.$emit('updateBackground', data) |