[pollen] branch feature/adminUser updated (d3d8c4b -> 074e217)
This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from d3d8c4b admin can reset an user password new 074e217 fix message for generate password successfull and translate message for disable user The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 074e217139511188aee1e772205b21504a740b67 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 24 11:54:47 2014 +0200 fix message for generate password successfull and translate message for disable user Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 ++ pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git commit 074e217139511188aee1e772205b21504a740b67 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 24 11:54:47 2014 +0200 fix message for generate password successfull and translate message for disable user --- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 ++ pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 75b5c53..7df81fc 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -39,7 +39,9 @@ var translateEN = { 'user.forgotPassword.success' : 'Password send by email', 'user.favoriteList' : 'Favorite list', 'user.disableMe' : 'Disable me', +'user.disableMe.success' : 'Disable successfull', 'user.disableUser' : 'Disable user', +'user.disableUser.success' : 'Disable successfull', 'user.generatePassword' : 'Generate new password', 'user.generatePassword.success' : 'E-mail send with new password', 'user.error.password.diff' : 'Passwords not equal', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index d516eaa..fa1000e 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -39,7 +39,9 @@ var translateFR = { 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', 'user.favoriteList' : 'Liste de Diffusion Favorite', 'user.disableMe' : 'Désactiver mon compte', +'user.disableMe.success' : 'Désactivation de mon compte avec succès', 'user.disableUser' : 'Désactiver l\'utilisateur', +'user.disableUser.success' : 'Désactivation de l\'utilisateur avec succès', 'user.generatePassword' : 'Générer un nouveau mot de passe', 'user.generatePassword.success' : 'Un mail avec le nouveau mot de passe vient d\'être envoyé..', 'user.error.password.diff' : 'Mot de passe différent', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 9f35596..931c461 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -125,7 +125,7 @@ angular.module('userControllers', []) var confirmDelete = confirm(confirmMessage); if (confirmDelete == true) { User.ban({userId: $scope.data.user.id, anonymize:true}, function (data) { - $rootScope.$broadcast('newSuccess', 'user.disabled.success'); + $rootScope.$broadcast('newSuccess', 'user.disableMe.success'); $rootScope.$broadcast('sessionExpired'); }) } @@ -170,7 +170,8 @@ angular.module('userControllers', []) $scope.generatePassword = function (user) { UserLostPassword.send({login: user.email}, function (data) { - $scope.$broadcast('newSuccess', 'user.generatePassword.success'); + $rootScope.$broadcast('newSuccess', 'user.generatePassword.success'); + user.isDisabled = false; }); } @@ -187,7 +188,7 @@ angular.module('userControllers', []) $scope.banUser = function (user) { User.ban({userId : user.id, anonymize:true}, function (data) { user.isDisabled = true; - $rootScope.$broadcast('newSuccess', 'user.ban.success'); + $rootScope.$broadcast('newSuccess', 'user.disableUser.success'); }); }; }]) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm