MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library|Trunk] 

Update email composer text for invite community managers
Error page: add page attribute as input



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61011 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2021-05-17 15:32:06 +00:00
parent 46890464da
commit 2e5ba2141a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connect/connectHelper.ts
View File

@ -1,5 +1,6 @@
import {HttpParams} from '@angular/common/http'; import {HttpParams} from '@angular/common/http';
import {properties} from "../../../environments/environment"; import {properties} from "../../../environments/environment";
import {Session} from "../login/utils/helper.class";
export class ConnectHelper { export class ConnectHelper {
@ -45,4 +46,9 @@ export class ConnectHelper {
properties.adminToolsPortalType = "community"; 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))))
}
} }

6
error/errorPage.component.ts
View File

@ -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 {Location} from '@angular/common';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {Title, Meta} from '@angular/platform-browser'; import {Title, Meta} from '@angular/platform-browser';
@ -42,7 +42,7 @@ import {properties} from "../../../environments/environment";
}) })
export class ErrorPageComponent { export class ErrorPageComponent {
public page: string; @Input() public page: string;
public page_type: string; public page_type: string;
public searchPage: string; public searchPage: string;
public page_type_name: string; public page_type_name: string;
@ -55,7 +55,7 @@ export class ErrorPageComponent {
ngOnInit() { ngOnInit() {
this.seoService.createLinkForCanonicalURL(properties.domain + properties.baseLink + "/error"); this.seoService.createLinkForCanonicalURL(properties.domain + properties.baseLink + "/error");
this.route.queryParams.subscribe(data => { this.route.queryParams.subscribe(data => {
this.page = data['page']; this.page = this.page?this.page:data['page'];
if (!this.page) { if (!this.page) {
this.page = this._location.path(true); this.page = this._location.path(true);
} }

4
utils/email/composer.ts
View File

@ -250,7 +250,7 @@ export class Composer {
public static composeEmailForCommunityDashboard(name: string, recipient: string) { public static composeEmailForCommunityDashboard(name: string, recipient: string) {
let email: Email = new Email(); let email: Email = new Email();
email.subject = 'OpenAIRE Monitor Dashboard | ' + name; email.subject = 'OpenAIRE Connect | ' + name;
email.body = this.composeMessageForCommunityDashboard(name); email.body = this.composeMessageForCommunityDashboard(name);
email.recipient = recipient; email.recipient = recipient;
return email; return email;
@ -266,7 +266,7 @@ export class Composer {
'<p>Please contact us at <a href="mailto:' + properties.helpdeskEmail+'">' + properties.helpdeskEmail + '<p>Please contact us at <a href="mailto:' + properties.helpdeskEmail+'">' + properties.helpdeskEmail +
'</a> if you have any questions or concerns.</p>' + '</a> if you have any questions or concerns.</p>' +
'<p>Kind Regards<br>The OpenAIRE Team</p>' + '<p>Kind Regards<br>The OpenAIRE Team</p>' +
'<p><a href="' + properties.domain + '" target="_blank">OpenAIRE Monitor</a></p>'; '<p><a href="https://' + (properties.environment == "production"?'':'beta.') + 'connect.openaire.eu/" target="_blank">OpenAIRE Connect</a></p>';
if(user) { if(user) {
message = message.replace('((__user__))', user); message = message.replace('((__user__))', user);
} }