Browse Source

minor fix

pull/146/head
Mohammed Tantawy 7 years ago
parent
commit
df1519d6a0
3 changed files with 6 additions and 4 deletions
  1. +2
    -1
      src/assets/scripts/logout/controller.js
  2. +3
    -2
      src/assets/scripts/nwLogin/controller.js
  3. +1
    -1
      src/assets/scripts/nwSidebar/sidebar.controller.js

+ 2
- 1
src/assets/scripts/logout/controller.js View File

@ -1,10 +1,11 @@
const LogoutController = ($scope, LogoutService, $cookies, UserService) => {
const LogoutController = ($scope, $location, LogoutService, $cookies, UserService) => {
$scope.userLogged = false;
$scope.userLogout = async () => {
await LogoutService.logoutUserService($scope.user);
$cookies.remove('access_token');
UserService.loadUser();
$location.path('/');
}
};

+ 3
- 2
src/assets/scripts/nwLogin/controller.js View File

@ -1,4 +1,4 @@
const LoginController = ($scope, $cookies, LoginService, UserService) => {
const LoginController = ($scope, $cookies, $location, LoginService, UserService) => {
// load the user if already logged in, for all controllers
UserService.loadUser();
@ -11,7 +11,8 @@ const LoginController = ($scope, $cookies, LoginService, UserService) => {
// save the cookie and reload the user for all controllers
$cookies.put('access_token', result.token);
UserService.loadUser();
$location.path('/');
$scope.$apply();
} else {
alert(result);
}


+ 1
- 1
src/assets/scripts/nwSidebar/sidebar.controller.js View File

@ -1,9 +1,9 @@
/** @ngInject */
const SidebarController = ($scope, UserService) => {
UserService.loadUser();
$scope.$on('loadUserSuccess', function (event, user) {
$scope.user = user;
});
UserService.loadUser();
}

Loading…
Cancel
Save