diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-10 15:21:25 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-10 15:21:25 +0200 |
commit | 1eb8b951c2eb6388efdd628c878110d78ae4e77d (patch) | |
tree | 30f62ea3dd0acf69384cd57d34024c8e82bbea13 /lib/private/Settings/Admin/Encryption.php | |
parent | 518545fc2fc93f31d1885f143a0386c5449679f4 (diff) | |
download | nextcloud-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 'lib/private/Settings/Admin/Encryption.php')
-rw-r--r-- | lib/private/Settings/Admin/Encryption.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Encryption.php index 38197f71143..331ddf54520 100644 --- a/lib/private/Settings/Admin/Encryption.php +++ b/lib/private/Settings/Admin/Encryption.php @@ -24,9 +24,9 @@ namespace OC\Settings\Admin; use OC\Encryption\Manager; +use OCP\AppFramework\Http\TemplateResponse; use OCP\IUserManager; use OCP\Settings\IAdmin; -use OCP\Template; class Encryption implements IAdmin { /** @var Manager */ @@ -41,9 +41,9 @@ class Encryption implements IAdmin { } /** - * @return Template all parameters are supposed to be assigned + * @return TemplateResponse */ - public function render() { + public function getForm() { $parameters = [ // Encryption API 'encryptionEnabled' => $this->manager->isEnabled(), @@ -51,11 +51,7 @@ class Encryption implements IAdmin { 'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1, ]; - $form = new Template('settings', 'admin/encryption'); - foreach ($parameters as $key => $value) { - $form->assign($key, $value); - } - return $form; + return new TemplateResponse('settings', 'admin/encryption', $parameters, ''); } /** |