Merge branch 'master' into staging

Leandro Santos
2 parents 254b194f 149cf6c3
Showing 1 changed file with 5 additions and 0 deletions Show diff stats
src/app/main/main.component.ts
@@ -110,6 +110,11 @@ export class EnvironmentContent {
         component: MainContentComponent,
         abstract: true,
         name: 'main',
+        resolve: {
+            currentUser: function(AuthService: AuthService) {
+                return AuthService.loginFromCookie();
+            }
+        }
     },
     {
         url: '/',
...	...	@@ -110,6 +110,11 @@ export class EnvironmentContent {
110	110	component: MainContentComponent,
111	111	abstract: true,
112	112	name: 'main',
	113	+ resolve: {
	114	+ currentUser: function(AuthService: AuthService) {
	115	+ return AuthService.loginFromCookie();
	116	+ }
	117	+ }
113	118	},
114	119	{
115	120	url: '/',
...	...