summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-10 15:21:25 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-08-10 15:21:25 +0200
commit1eb8b951c2eb6388efdd628c878110d78ae4e77d (patch)
tree30f62ea3dd0acf69384cd57d34024c8e82bbea13 /settings
parent518545fc2fc93f31d1885f143a0386c5449679f4 (diff)
downloadnextcloud-server-1eb8b951c2eb6388efdd628c878110d78ae4e77d.tar.gz
nextcloud-server-1eb8b951c2eb6388efdd628c878110d78ae4e77d.zip
more admin page splitup improvements
* bump version to ensure tables are created * make updatenotification app use settings api * change IAdmin::render() to getForm() and change return type from Template to TemplateResponse * adjust User_LDAP accordingly, as well as built-in forms * add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke * make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/AdminSettingsController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/Controller/AdminSettingsController.php b/settings/Controller/AdminSettingsController.php
index b6a6e74705f..f27bdd3ec33 100644
--- a/settings/Controller/AdminSettingsController.php
+++ b/settings/Controller/AdminSettingsController.php
@@ -92,8 +92,8 @@ class AdminSettingsController extends Controller {
foreach ($settings as $prioritizedSettings) {
foreach ($prioritizedSettings as $setting) {
/** @var \OCP\Settings\IAdmin $setting */
- $form = $setting->render();
- $html .= $form->fetchPage();
+ $form = $setting->getForm();
+ $html .= $form->renderAs('')->render();
}
}
return ['content' => $html];