From 4118cb0be6f821140737c4dc63b42bd93cd3eeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 14 Aug 2020 16:47:17 +0200 Subject: [PATCH] Do not reset background on every save MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .../lib/Controller/DashboardController.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/dashboard/lib/Controller/DashboardController.php b/apps/dashboard/lib/Controller/DashboardController.php index 1c11ca2451..bd83ca4584 100644 --- a/apps/dashboard/lib/Controller/DashboardController.php +++ b/apps/dashboard/lib/Controller/DashboardController.php @@ -127,19 +127,16 @@ class DashboardController extends Controller { * @NoAdminRequired */ public function setBackground($path = null, $url = null, $shipped = null): JSONResponse { - // FIXME: store current version of the background and return the result - // FIXME: handle shipped backgrounds avoid file duplication - // FIXME: allow to reset to default ones if ($shipped !== null) { $this->backgroundService->setShippedBackground($shipped); - } - if ($path !== null) { + } else if ($path !== null) { $this->backgroundService->setFileBackground($path); - } - if ($url !== null) { + } else if ($url !== null) { $this->backgroundService->setUrlBackground($url); + } else { + $this->backgroundService->setDefaultBackground(); } - $this->backgroundService->setDefaultBackground(); + return new JSONResponse([]); }