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

[Trunk | Library]: 

1. bottom.component.ts: [Bug fix] When no communityId set, in "getDivContents()", get communityId from properties.adminToolsCommunity (fix for Connect Portal).
2. helper.service.ts: In "getPageHelpContents()" and "getDivHelpContents()", when no communityId is set, get it from properties.adminToolsCommunity if available, otherwise set it to 'openaire' (as it was).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61090 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2021-06-04 09:42:23 +00:00
parent eb2d232bb7
commit 33b8c95f54
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sharedComponents/bottom.component.ts
View File

@ -86,10 +86,12 @@ constructor(private config: ConfigurationService, private route: ActivatedRoute
} }
private getDivContents() { private getDivContents() {
if (this.communityId) { let communityId = this.communityId;
this.subs.push(this.helper.getDivHelpContents(this.properties, this.communityId, "/").subscribe(contents => { if(!communityId) {
this.divContents = contents; communityId = properties.adminToolsCommunity;
}));
} }
this.subs.push(this.helper.getDivHelpContents(this.properties, communityId, "/").subscribe(contents => {
this.divContents = contents;
}));
} }
} }

6
utils/helper/helper.service.ts
View File

@ -31,6 +31,9 @@ export class HelperService {
} }
getPageHelpContents(properties:EnvProperties, communityId:string, router: string):any { getPageHelpContents(properties:EnvProperties, communityId:string, router: string):any {
if(!communityId) {
communityId = properties.adminToolsCommunity;
}
if(!communityId) { if(!communityId) {
communityId = 'openaire'; communityId = 'openaire';
} }
@ -46,6 +49,9 @@ export class HelperService {
} }
getDivHelpContents(properties:EnvProperties, communityId:string, router: string):any { getDivHelpContents(properties:EnvProperties, communityId:string, router: string):any {
if(!communityId) {
communityId = properties.adminToolsCommunity;
}
if(!communityId) { if(!communityId) {
communityId = 'openaire'; communityId = 'openaire';
} }