DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix settings canonical webroot (#173)

Browse Source 
* Use same order as in setSettings() func below

Signed-off-by: Patrik Kernstock <info@pkern.at>

* 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 <info@pkern.at>
This commit is contained in:
Patrik Kernstock 2018-02-18 13:16:07 +01:00 committed by Andras Timar
parent adaec21323
commit c1f708f61d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Controller/SettingsController.php
View File

@ -53,8 +53,8 @@ class SettingsController extends Controller{
public function getSettings() { public function getSettings() {
return new JSONResponse([ return new JSONResponse([
'wopi_url' => $this->appConfig->getAppValue('wopi_url'), 'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
'use_groups' => $this->appConfig->getAppValue('use_groups'),
'edit_groups' => $this->appConfig->getAppValue('edit_groups'), 'edit_groups' => $this->appConfig->getAppValue('edit_groups'),
'use_groups' => $this->appConfig->getAppValue('use_groups'),
'doc_format' => $this->appConfig->getAppValue('doc_format'), 'doc_format' => $this->appConfig->getAppValue('doc_format'),
]); ]);
} }

1
lib/Settings/Admin.php
View File

@ -51,6 +51,7 @@ class Admin implements ISettings {
'use_groups' => $this->config->getAppValue('richdocuments', 'use_groups'), 'use_groups' => $this->config->getAppValue('richdocuments', 'use_groups'),
'doc_format' => $this->config->getAppValue('richdocuments', 'doc_format'), 'doc_format' => $this->config->getAppValue('richdocuments', 'doc_format'),
'external_apps' => $this->config->getAppValue('richdocuments', 'external_apps'), 'external_apps' => $this->config->getAppValue('richdocuments', 'external_apps'),
'canonical_webroot' => $this->config->getAppValue('richdocuments', 'canonical_webroot'),
], ],
'blank' 'blank'
); );