diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Activity/SecurityProvider.php | 2 | ||||
| -rw-r--r-- | settings/ajax/uninstallapp.php | 4 | ||||
| -rw-r--r-- | settings/js/apps.js | 12 | ||||
| -rw-r--r-- | settings/js/settings/personalInfo.js | 14 | ||||
| -rw-r--r-- | settings/js/users/users.js | 3 |
5 files changed, 22 insertions, 13 deletions
diff --git a/settings/Activity/SecurityProvider.php b/settings/Activity/SecurityProvider.php index f0789842e82..680881b6e31 100644 --- a/settings/Activity/SecurityProvider.php +++ b/settings/Activity/SecurityProvider.php @@ -53,7 +53,7 @@ class SecurityProvider implements IProvider { throw new InvalidArgumentException(); } - $l = $this->l10n->get('core', $language); + $l = $this->l10n->get('settings', $language); switch ($event->getSubject()) { case 'twofactor_success': diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index b4a2468bd2a..a932e2d79e9 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -43,8 +43,8 @@ $appId = OC_App::cleanAppId($appId); $result = OC_App::removeApp($appId); if($result !== false) { // FIXME: Clear the cache - move that into some sane helper method - \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0'); - \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1'); + \OC::$server->getMemCacheFactory()->createDistributed('settings')->remove('listApps-0'); + \OC::$server->getMemCacheFactory()->createDistributed('settings')->remove('listApps-1'); OC_JSON::success(array('data' => array('appid' => $appId))); } else { $l = \OC::$server->getL10N('settings'); diff --git a/settings/js/apps.js b/settings/js/apps.js index 6406e37cbcb..0a6e86ed701 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -535,20 +535,20 @@ OC.Settings.Apps = OC.Settings.Apps || { showEmptyUpdates: function() { $('#apps-list').addClass('hidden'); - $('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'No app updates available')); + $('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'App up to date')); $('#app-list-empty-icon').removeClass('icon-search').addClass('icon-download'); }, updateApp:function(appId, element) { var oldButtonText = element.val(); - element.val(t('settings','Updating....')); + element.val(t('settings','Upgrading …')); OC.Settings.Apps.hideErrorMessage(appId); $.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { if (result.data && result.data.message) { OC.Settings.Apps.showErrorMessage(appId, result.data.message); } else { - OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Could not upgrade app')); } element.val(oldButtonText); } @@ -584,7 +584,7 @@ OC.Settings.Apps = OC.Settings.Apps || { element.val(t('settings','Removing …')); $.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { - OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while removing app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Could not remove app')); element.val(t('settings','Remove')); } else { OC.Settings.Apps.rebuildNavigation(); @@ -722,9 +722,9 @@ OC.Settings.Apps = OC.Settings.Apps || { OC.dialogs.info( t( 'settings', - 'The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.' + 'The app has been enabled but needs to be upgraded. You will be redirected to the upgrade page in 5 seconds.' ), - t('settings','App update'), + t('settings','App upgrade'), function () { window.location.reload(); }, diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js index 3a4542df748..0a39e607762 100644 --- a/settings/js/settings/personalInfo.js +++ b/settings/js/settings/personalInfo.js @@ -60,7 +60,7 @@ function updateAvatar (hidedefault) { $displaydiv.avatar(user.uid, 145, true, null, function() { $displaydiv.removeClass('loading'); $('#displayavatar img').show(); - if($('#displayavatar img').length === 0) { + if($('#displayavatar img').length === 0 || oc_userconfig.avatar.generated) { $('#removeavatar').removeClass('inlineblock').addClass('hidden'); } else { $('#removeavatar').removeClass('hidden').addClass('inlineblock'); @@ -129,6 +129,7 @@ function avatarResponseHandler (data) { $warning.hide(); if (data.status === "success") { $('#displayavatar .avatardiv').removeClass('icon-loading'); + oc_userconfig.avatar.generated = false; updateAvatar(); } else if (data.data === "notsquare") { showAvatarCropper(); @@ -256,8 +257,14 @@ $(document).ready(function () { }); + var userSettings = new OC.Settings.UserSettings(); var federationSettingsView = new OC.Settings.FederationSettingsView({ - el: '#personal-settings' + el: '#personal-settings', + config: userSettings + }); + + userSettings.on("sync", function() { + updateAvatar(false); }); federationSettingsView.render(); @@ -362,6 +369,7 @@ $(document).ready(function () { type: 'DELETE', url: OC.generateUrl('/avatar/'), success: function () { + oc_userconfig.avatar.generated = true; updateAvatar(true); } }); @@ -392,7 +400,7 @@ $(document).ready(function () { // Load the big avatar var user = OC.getCurrentUser(); $('#avatarform .avatardiv').avatar(user.uid, 145, true, null, function() { - if($('#displayavatar img').length === 0) { + if($('#displayavatar img').length === 0 || oc_userconfig.avatar.generated) { $('#removeavatar').removeClass('inlineblock').addClass('hidden'); } else { $('#removeavatar').removeClass('hidden').addClass('inlineblock'); diff --git a/settings/js/users/users.js b/settings/js/users/users.js index af41790a7c4..1d6cb93452a 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -970,8 +970,9 @@ $(document).ready(function () { $tr.addClass('active'); }); - $(document.body).click(function () { + $(document).on('mouseup', function () { $('#userlist tr.active').removeClass('active'); + $('#userlist .popovermenu.open').removeClass('open'); }); $userListBody.on('click', '.action-togglestate', function (event) { |