From fa5a48bc3a76b109f6611620b6e56f3024def029 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 2 Mar 2016 17:41:04 +0100
Subject: Correct bugs

---
 client/js/controllers/login.js  | 3 ++-
 client/js/controllers/status.js | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'client/js/controllers')

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 1a89563..63cb6d1 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -16,10 +16,11 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 
 	// Manager logout event
 	$scope.$on('logoutEvent', function(){
-		Identity.logout();
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	});
 
+
+	
 	// Hide loading button and message alert
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 940d794..6f398ad 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -11,10 +11,10 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
 
 	// Give profile to model
     $scope.profile=Identity.getProfile();
-
+	
     // Function to logout
-    $scope.raiseLogoutEvent=function(){
-		$rootScope.$broadcast('logoutEvent');
+    $scope.logout=function(){
+		Identity.logout();
 	};
 
 }]);
-- 
cgit v1.2.3