small fixes

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2016-11-21 09:07:50 +01:00 committed by Roeland Jago Douma
parent d001dbd259
commit 5aed91c321
No known key found for this signature in database
GPG Key ID: F941078878347C0C
3 changed files with 7 additions and 8 deletions

View File

@ -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) {

View File

@ -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

View File

@ -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
},