01/02: Add logout

21 May 2014

This is an automated email from the git hooks/post-receive script.

unknown user pushed a commit to branch devel
in repository Pollen.

commit e851357e83cd364143f72e182c85691f86bea18e
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed May 21 11:05:53 2014 +0200

    Add logout
---
 pollen-ui-angular/src/main/webapp/index.html                 | 2 +-
 pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 9 ++++++++-
 pollen-ui-angular/src/main/webapp/js/services.js             | 9 +++++++++
 pollen-ui-angular/src/main/webapp/partials/poll.html         | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html
index f28caca..70f9b0f 100644
--- a/pollen-ui-angular/src/main/webapp/index.html
+++ b/pollen-ui-angular/src/main/webapp/index.html
@@ -81,7 +81,7 @@
 
             <li class="divider" role="presentation"></li>
             <li role="presentation">
-              <a id='menuItemLogout'>Deconnexion</a>
+              <a ng-click="logout()">Deconnexion</a>
             </li>
 
           </ul>
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 b99340b..ba64d3f 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', 'User','$cookies', function ($scope, UserLogin, User,$cookies) {
+.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User','$cookies', function ($scope, UserLogin, UserLogout, User,$cookies) {
   if (!angular.isDefined($scope.data)) {
     $scope.data = {user:{}};
   }
@@ -48,4 +48,11 @@
       $cookies.sessionToken = data.permission;
     });
   }
+
+  $scope.logout = function () {
+    UserLogout.logout(function (data) {
+        delete $cookies.sessionToken;
+        delete $scope.currentUser;
+    })
+  }
 }])
\ No newline at end of file
diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js
index d280f9e..34abfe5 100644
--- a/pollen-ui-angular/src/main/webapp/js/services.js
+++ b/pollen-ui-angular/src/main/webapp/js/services.js
@@ -133,4 +133,13 @@ angular.module('pollenServices', ['ngResource'])
       }
     }
   );
+}])
+
+.factory('UserLogout', ['$resource', function ($resource) {
+    return $resource(conf.restURL+'/logout', {},
+    {
+        'logout' : {
+            method: 'GET'
+        }
+    })
 }])
\ No newline at end of file
diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html
index 6a676ba..0363f7a 100644
--- a/pollen-ui-angular/src/main/webapp/partials/poll.html
+++ b/pollen-ui-angular/src/main/webapp/partials/poll.html
@@ -43,7 +43,7 @@
     </h1>
   </div>
 
-  <div ng-hide="showEditDesc || !globalVariables.editMode && !poll.description " class="pollDesc" edit-me="showEditDesc">
+  <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc">
     <div ng-bind-html="toHTML(data.poll.description || 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise')"></div>
   </div>
   <div ng-show="showEditDesc" class="pollDesc">

-- 
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm@chorem.org>.

    

Chorem.org scm

tags

participants (1)