From 5621e8341def5afd7b72e134c054f74e6e6ee895 Mon Sep 17 00:00:00 2001
From: CeĢsar Calvo <ccalvo@curisit.net>
Date: Tue, 14 Mar 2017 18:17:42 +0000
Subject: [PATCH] #3527 - Main menu
---
securis/src/main/webapp/src/app/home.component.ts | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/securis/src/main/webapp/src/app/home.component.ts b/securis/src/main/webapp/src/app/home.component.ts
index e74963c..d905c50 100644
--- a/securis/src/main/webapp/src/app/home.component.ts
+++ b/securis/src/main/webapp/src/app/home.component.ts
@@ -22,7 +22,7 @@
@ViewChild('mainMenu') mainMenu: TdNavigationDrawerComponent;
securisVersion : string;
- showMenu : boolean = false;
+ isLoggedIn : boolean = false;
constructor(private userService: UserService,
toaster: ToastsManager,
@@ -60,13 +60,15 @@
this.mainMenu.close();
}
- ngAfterViewInit(): void {
- // this.showMenu = true;
- this.media.broadcast();
+ ngOnInit(): void {
this.userService.isLoggedIn().subscribe(authOk => {
- //this.showMenu = authOk.valueOf();
- this.router.navigateByUrl(authOk ? 'packs' : 'login');
- },
- err => /* Show message */ this.router.navigateByUrl('login'));
+ this.isLoggedIn = true//authOk.valueOf();
+ this.router.navigateByUrl(this.isLoggedIn ? 'packs' : 'login');
+ } ,
+ err => /* Show message */ this.router.navigateByUrl('login'));
+ }
+
+ ngAfterViewInit(): void {
+ this.media.broadcast();
}
}
--
Gitblit v1.3.2