Merge branch 'develop' into new-community-api
This commit is contained in:
commit
3a4203aef8
|
@ -126,7 +126,7 @@ export class AppComponent implements OnInit {
|
||||||
this.subscriptions.push(this.data.subscribe(data => {
|
this.subscriptions.push(this.data.subscribe(data => {
|
||||||
if(data && data.portal) {
|
if(data && data.portal) {
|
||||||
this.setProperties(data.portal);
|
this.setProperties(data.portal);
|
||||||
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
|
this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
||||||
|
@ -172,7 +172,7 @@ export class AppComponent implements OnInit {
|
||||||
} else {
|
} else {
|
||||||
ConnectHelper.setPortalTypeFromPid(id);
|
ConnectHelper.setPortalTypeFromPid(id);
|
||||||
}
|
}
|
||||||
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
|
this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
|
||||||
}
|
}
|
||||||
|
|
||||||
public get open() {
|
public get open() {
|
||||||
|
|
|
@ -133,7 +133,7 @@ export class StatsComponent implements OnInit {
|
||||||
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
|
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
|
||||||
} else {
|
} else {
|
||||||
//console.log(`calling ${this.properties.adminToolsAPIURL}/communityFull/${this.communityId}`);
|
//console.log(`calling ${this.properties.adminToolsAPIURL}/communityFull/${this.communityId}`);
|
||||||
this.configService.communityInformationState.subscribe(
|
this.configService.portalAsObservable.subscribe(
|
||||||
res => {
|
res => {
|
||||||
console.debug(res);
|
console.debug(res);
|
||||||
if(res) {
|
if(res) {
|
||||||
|
|
Loading…
Reference in New Issue