MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

[Monitor Dashboard | Trunk]: Remove url from getUserInfo. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57940 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2019-12-23 15:10:27 +00:00
parent 947cef796f
commit 7813307992
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app.component.ts
View File

@ -71,9 +71,10 @@ export class AppComponent implements OnInit, OnDestroy {
} }
} else { } else {
this.stakeholderService.setStakeholder(null); this.stakeholderService.setStakeholder(null);
this.layoutService.setOpen(true);
} }
})); }));
this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
this.buildMenu(); this.buildMenu();
}, error => { }, error => {

4
src/app/monitor/monitor.component.ts
View File

@ -141,7 +141,7 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent
} else { } else {
this.setView(params); this.setView(params);
} }
this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
this.buildMenu(); this.buildMenu();
}, error => { }, error => {
@ -208,7 +208,7 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent
} else { } else {
this.setView(params); this.setView(params);
} }
this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
this.buildMenu(); this.buildMenu();
}, error => { }, error => {

2
src/app/utils/subscribe/subscribe.component.ts
View File

@ -69,7 +69,7 @@ export class SubscribeComponent {
this.route.data this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => { .subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific; this.properties = data.envSpecific;
this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe( user => { this.userManagementService.getUserInfo().subscribe(user => {
this.user = user; this.user = user;
if (!this.showNumbers) { if (!this.showNumbers) {
let email = (this.user)?this.user.email:null; let email = (this.user)?this.user.email:null;