This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit bb5a0b3f3636f0d9c90115cf25dd0d135b468e64 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 28 16:26:31 2014 +0200 fixes #1068 redirect to home when logout and delete all alert, and delete all data in session storage without locale --- .../src/main/webapp/js/controllers/userCtrl.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 146c079..01a0e2d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -88,6 +88,7 @@ angular.module('userControllers', []) currentUser.emailIsValidate = true; SessionStorage.save({user: currentUser}); $rootScope.$broadcast('editUser'); + $rootScope.$broadcast('cleanAlert'); } $location.url('/'); }, function () { @@ -266,12 +267,18 @@ angular.module('userControllers', []) $scope.logout = function () { UserLogout.logout(); - // delete user information - SessionStorage.remove('token'); - SessionStorage.remove('user'); + $rootScope.$broadcast('cleanAlert'); + + var locale = SessionStorage.get().locale; + + // all information + SessionStorage.remove(); delete $scope.currentUser; + // stock the locale + SessionStorage.save({locale : locale}); + //got to the home - $route.reload(); + $location.url('/'); } }]); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.