diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index c66911d1..67a599a4 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -1,5 +1,6 @@ import {HttpParams} from '@angular/common/http'; import {properties} from "../../../environments/environment"; +import {Session} from "../login/utils/helper.class"; export class ConnectHelper { @@ -45,4 +46,9 @@ export class ConnectHelper { properties.adminToolsPortalType = "community"; } } + + + public static isPrivate(community, user) { + return community && (community.status == "hidden" || (community.status == "manager" && !(Session.isCommunityCurator(user) || Session.isManager("community", community.communityId, user)))) + } } diff --git a/error/errorPage.component.ts b/error/errorPage.component.ts index faabb70c..68d2a881 100644 --- a/error/errorPage.component.ts +++ b/error/errorPage.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, Optional} from '@angular/core'; +import {Component, Inject, Input, Optional} from '@angular/core'; import {Location} from '@angular/common'; import {ActivatedRoute} from '@angular/router'; import {Title, Meta} from '@angular/platform-browser'; @@ -42,7 +42,7 @@ import {properties} from "../../../environments/environment"; }) export class ErrorPageComponent { - public page: string; + @Input() public page: string; public page_type: string; public searchPage: string; public page_type_name: string; @@ -55,7 +55,7 @@ export class ErrorPageComponent { ngOnInit() { this.seoService.createLinkForCanonicalURL(properties.domain + properties.baseLink + "/error"); this.route.queryParams.subscribe(data => { - this.page = data['page']; + this.page = this.page?this.page:data['page']; if (!this.page) { this.page = this._location.path(true); } diff --git a/utils/email/composer.ts b/utils/email/composer.ts index 0f2c7c6b..67f6b0cf 100644 --- a/utils/email/composer.ts +++ b/utils/email/composer.ts @@ -250,7 +250,7 @@ export class Composer { public static composeEmailForCommunityDashboard(name: string, recipient: string) { let email: Email = new Email(); - email.subject = 'OpenAIRE Monitor Dashboard | ' + name; + email.subject = 'OpenAIRE Connect | ' + name; email.body = this.composeMessageForCommunityDashboard(name); email.recipient = recipient; return email; @@ -266,7 +266,7 @@ export class Composer { '

Please contact us at ' + properties.helpdeskEmail + ' if you have any questions or concerns.

' + '

Kind Regards
The OpenAIRE Team

' + - '

OpenAIRE Monitor

'; + '

OpenAIRE Connect

'; if(user) { message = message.replace('((__user__))', user); }