From 779be7dd43c3157c06dbda9c03281a9d1e62702e Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 5 Jun 2019 13:55:35 +0000 Subject: [PATCH] [Library|Trunk ] ... pass properties as parameter (error/isRouteEnabled.guard.ts) git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55997 d315682c-612b-4755-9ff5-7f18f6832af3 --- error/isRouteEnabled.guard.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts index 3a59488c..f65b488a 100644 --- a/error/isRouteEnabled.guard.ts +++ b/error/isRouteEnabled.guard.ts @@ -33,12 +33,12 @@ export class IsRouteEnabled implements CanActivate { if (!community) { community = ConnectHelper.getCommunityFromDomain(res.domain); } - return res['adminToolsAPIURL']; - }),mergeMap(url => { + return res; + }),mergeMap(prop => { if (!community) { // no community to check - return true return observableOf(true); } - return this.config.isPageEnabled(url, community, '/' + path.split('?')[0].substring(1)); + return this.config.isPageEnabled(prop, community, '/' + path.split('?')[0].substring(1)); }),); obs.pipe(filter(enabled => !enabled)) .subscribe(() => this.router.navigate([redirect], {queryParams: {'page': path}}));