small fixes

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/settings/Application.php b/settings/Application.php
index 2f9b786d4388b24c2078ae0da22f0c55627eb55e..ca2b2b91f71958eca4540a41e343f301bcc15fff 100644 (file)
--- a/settings/Application.php
+++ b/settings/Application.php
@@ -96,16 +96,18 @@ class Application extends App {
                                $c->query('Logger')
                        );
                });
+
                $container->registerService('AppSettingsController', function(IContainer $c) {
                        return new AppSettingsController(
                                $c->query('AppName'),
                                $c->query('Request'),
                                $c->query('L10N'),
                                $c->query('Config'),
-                               $c->query('ICacheFactory'),
                                $c->query('INavigationManager'),
                                $c->query('IAppManager'),
-                               $c->query('OcsClient')
+                               $c->query('CategoryFetcher'),
+                               $c->query('AppFetcher'),
+                               \OC::$server->getL10NFactory()
                        );
                });
                $container->registerService('AuthSettingsController', function(IContainer $c) {

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 77d65877ba342d56b0ffa6e74cf209e73af25920..58cc59f9848fe695079c71cc222ce3b16271101b 100644 (file)
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -63,7 +63,7 @@ class UsersController extends Controller {
        private $isAdmin;
        /** @var IUserManager */
        private $userManager;
-       /** @var \OC\Group\Manager */
+       /** @var IGroupManager */
        private $groupManager;
        /** @var IConfig */
        private $config;
@@ -671,9 +671,6 @@ class UsersController extends Controller {
         * @PasswordConfirmationRequired
         * @todo merge into saveUserSettings
         *
-        * @NoAdminRequired
-        * @PasswordConfirmationRequired
-        *
         * @param string $username
         * @param string $displayName
         * @return DataResponse

diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index 36b720e8c45fef389b4b41c70deaa4f47de85a9b..066f648c104a080ec3183b9aa00a42f9d69e1621 100644 (file)
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -46,8 +46,8 @@
                        this._scopes = [
                                {
                                        name: 'private',
-                                       displayName: (this.field == 'avatar' || this.field == 'displayname') ? t('core', 'Local') : t('core', 'Private'),
-                                       tooltip: (this.field == 'avatar' || this.field == 'displayname') ? t('core', 'Only visible to local users') : t('core', 'Only visible to you'),
+                                       displayName: (this.field === 'avatar' || this.field === 'displayname') ? t('core', 'Local') : t('core', 'Private'),
+                                       tooltip: (this.field === 'avatar' || this.field === 'displayname') ? t('core', 'Only visible to local users') : t('core', 'Only visible to you'),
                                        icon: OC.imagePath('core', 'actions/password'),
                                        active: false
                                },