diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 15:02:14 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 15:02:14 +0100 |
| commit | 211ebb0e432b5fee2031dd6e7338e659146867bb (patch) | |
| tree | 2a0dd885ae961f0b7219f546cc9425ce70fdf745 /client/js/controllers | |
| parent | 7676509fcd6ab0a6c3e666c00c6ff96ecc1f7ffb (diff) | |
Simplify Identity
Diffstat (limited to 'client/js/controllers')
| -rw-r--r-- | client/js/controllers/login.js | 7 | ||||
| -rw-r--r-- | client/js/controllers/status.js | 2 |
2 files changed, 7 insertions, 2 deletions
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(){ |