From 211ebb0e432b5fee2031dd6e7338e659146867bb Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 24 Feb 2016 15:02:14 +0100 Subject: Simplify Identity --- client/js/controllers/login.js | 7 ++++++- client/js/controllers/status.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'client/js/controllers') diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index a37591c..66d1793 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -13,13 +13,18 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s if(!Identity.isAlreadyLogin()){ $('#loginModal').modal({backdrop: 'static', keyboard: false}); } + + // Manager logout event $scope.$on('logoutEvent', function(){ $('#loginModal').modal({backdrop: 'static', keyboard: false}); }); - + + // Hide loading button and message alert $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); + + // Defined function for login $scope.loginAction=function(){ // Begin login state for template diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index e01df34..5ec6fa8 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -10,7 +10,7 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($ { // Give profile to model - $scope.profile=Identity.profile; + $scope.profile=Identity.getProfile(); // Function to logout $scope.logout=function(){ -- cgit v1.2.3