small fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
d001dbd259
commit
5aed91c321
|
@ -96,16 +96,18 @@ class Application extends App {
|
||||||
$c->query('Logger')
|
$c->query('Logger')
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
$container->registerService('AppSettingsController', function(IContainer $c) {
|
$container->registerService('AppSettingsController', function(IContainer $c) {
|
||||||
return new AppSettingsController(
|
return new AppSettingsController(
|
||||||
$c->query('AppName'),
|
$c->query('AppName'),
|
||||||
$c->query('Request'),
|
$c->query('Request'),
|
||||||
$c->query('L10N'),
|
$c->query('L10N'),
|
||||||
$c->query('Config'),
|
$c->query('Config'),
|
||||||
$c->query('ICacheFactory'),
|
|
||||||
$c->query('INavigationManager'),
|
$c->query('INavigationManager'),
|
||||||
$c->query('IAppManager'),
|
$c->query('IAppManager'),
|
||||||
$c->query('OcsClient')
|
$c->query('CategoryFetcher'),
|
||||||
|
$c->query('AppFetcher'),
|
||||||
|
\OC::$server->getL10NFactory()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
$container->registerService('AuthSettingsController', function(IContainer $c) {
|
$container->registerService('AuthSettingsController', function(IContainer $c) {
|
||||||
|
|
|
@ -63,7 +63,7 @@ class UsersController extends Controller {
|
||||||
private $isAdmin;
|
private $isAdmin;
|
||||||
/** @var IUserManager */
|
/** @var IUserManager */
|
||||||
private $userManager;
|
private $userManager;
|
||||||
/** @var \OC\Group\Manager */
|
/** @var IGroupManager */
|
||||||
private $groupManager;
|
private $groupManager;
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
private $config;
|
private $config;
|
||||||
|
@ -671,9 +671,6 @@ class UsersController extends Controller {
|
||||||
* @PasswordConfirmationRequired
|
* @PasswordConfirmationRequired
|
||||||
* @todo merge into saveUserSettings
|
* @todo merge into saveUserSettings
|
||||||
*
|
*
|
||||||
* @NoAdminRequired
|
|
||||||
* @PasswordConfirmationRequired
|
|
||||||
*
|
|
||||||
* @param string $username
|
* @param string $username
|
||||||
* @param string $displayName
|
* @param string $displayName
|
||||||
* @return DataResponse
|
* @return DataResponse
|
||||||
|
|
|
@ -46,8 +46,8 @@
|
||||||
this._scopes = [
|
this._scopes = [
|
||||||
{
|
{
|
||||||
name: 'private',
|
name: 'private',
|
||||||
displayName: (this.field == 'avatar' || this.field == 'displayname') ? t('core', 'Local') : t('core', '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'),
|
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'),
|
icon: OC.imagePath('core', 'actions/password'),
|
||||||
active: false
|
active: false
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue