[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:
parent
eb2d232bb7
commit
33b8c95f54
|
@ -86,10 +86,12 @@ constructor(private config: ConfigurationService, private route: ActivatedRoute
|
|||
}
|
||||
|
||||
private getDivContents() {
|
||||
if (this.communityId) {
|
||||
this.subs.push(this.helper.getDivHelpContents(this.properties, this.communityId, "/").subscribe(contents => {
|
||||
let communityId = this.communityId;
|
||||
if(!communityId) {
|
||||
communityId = properties.adminToolsCommunity;
|
||||
}
|
||||
this.subs.push(this.helper.getDivHelpContents(this.properties, communityId, "/").subscribe(contents => {
|
||||
this.divContents = contents;
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,6 +31,9 @@ export class HelperService {
|
|||
}
|
||||
|
||||
getPageHelpContents(properties:EnvProperties, communityId:string, router: string):any {
|
||||
if(!communityId) {
|
||||
communityId = properties.adminToolsCommunity;
|
||||
}
|
||||
if(!communityId) {
|
||||
communityId = 'openaire';
|
||||
}
|
||||
|
@ -46,6 +49,9 @@ export class HelperService {
|
|||
}
|
||||
|
||||
getDivHelpContents(properties:EnvProperties, communityId:string, router: string):any {
|
||||
if(!communityId) {
|
||||
communityId = properties.adminToolsCommunity;
|
||||
}
|
||||
if(!communityId) {
|
||||
communityId = 'openaire';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue