This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 837cb4883e893a1d99a57bcdc1a4160e115bddbf Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 21 16:20:43 2014 +0200 reload page when connect and disconnect --- .../src/main/webapp/js/controllers/userCtrl.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 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 87a3a70..bf2517f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', function ($scope, UserLogin, UserLogout, User, SessionStorage) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } @@ -44,22 +44,30 @@ $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { + SessionStorage.save({'token':data.permission}); + User.get({userId: data.id}, function (user) { $scope.currentUser = user; SessionStorage.save({'user':user}); + + delete $scope.data.user; + // reload page for right user + $route.reload(); }) - SessionStorage.save({'token':data.permission}); }, function (error) { $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; }); - delete $scope.data.user; } $scope.logout = function () { UserLogout.logout(function (data) { - SessionStorage.remove('token'); - SessionStorage.remove('user'); - delete $scope.currentUser; + // delete user information + SessionStorage.remove('token'); + SessionStorage.remove('user'); + delete $scope.currentUser; + + //reload page for right user + $route.reload(); }) } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.