Browse Source

Fixed unselection of app.

pull/164/head
Sebastian Stehle 8 years ago
parent
commit
4759e8c4ce
  1. 3
      src/Squidex/app/app.routes.ts
  2. 7
      src/Squidex/app/shared/guards/unset-app.guard.ts

3
src/Squidex/app/app.routes.ts

@ -42,7 +42,8 @@ export const routes: Routes = [
}, },
{ {
path: 'administration', path: 'administration',
loadChildren: './features/administration/module#SqxFeatureAdministrationModule' loadChildren: './features/administration/module#SqxFeatureAdministrationModule',
canActivate: [UnsetAppGuard]
}, },
{ {
path: ':appName', path: ':appName',

7
src/Squidex/app/shared/guards/unset-app.guard.ts

@ -7,6 +7,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router'; import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { AppsStoreService } from './../services/apps-store.service'; import { AppsStoreService } from './../services/apps-store.service';
@ -17,9 +18,7 @@ export class UnsetAppGuard implements CanActivate {
) { ) {
} }
public canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { public canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
this.appsStore.selectApp(null); return this.appsStore.selectApp(null).map(a => !a);
return true;
} }
} }
Loading…
Cancel
Save