From c1f708f61dcbbc8fe68d219a82b948f427bf2bb9 Mon Sep 17 00:00:00 2001 From: Patrik Kernstock Date: Sun, 18 Feb 2018 13:16:07 +0100 Subject: [PATCH] Fix settings canonical webroot (#173) * Use same order as in setSettings() func below Signed-off-by: Patrik Kernstock * Fixed Canonical-Webroot setting The Canonical-Webroot setting was not read properly on the /settings/admin/richdocuments settings page. So this also fixes the notices when visting the admin page: "Undefined index: canonical_webroot at /apps/richdocuments/templates/admin.php#44" Signed-off-by: Patrik Kernstock --- lib/Controller/SettingsController.php | 2 +- lib/Settings/Admin.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index a62afa33..ac77b085 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -53,8 +53,8 @@ class SettingsController extends Controller{ public function getSettings() { return new JSONResponse([ 'wopi_url' => $this->appConfig->getAppValue('wopi_url'), - 'use_groups' => $this->appConfig->getAppValue('use_groups'), 'edit_groups' => $this->appConfig->getAppValue('edit_groups'), + 'use_groups' => $this->appConfig->getAppValue('use_groups'), 'doc_format' => $this->appConfig->getAppValue('doc_format'), ]); } diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 7fffc285..0bad4f7c 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -51,6 +51,7 @@ class Admin implements ISettings { 'use_groups' => $this->config->getAppValue('richdocuments', 'use_groups'), 'doc_format' => $this->config->getAppValue('richdocuments', 'doc_format'), 'external_apps' => $this->config->getAppValue('richdocuments', 'external_apps'), + 'canonical_webroot' => $this->config->getAppValue('richdocuments', 'canonical_webroot'), ], 'blank' );