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

Fix modal heights for all dashboard pages

This commit is contained in:
Konstantinos Triantafyllou 2022-06-20 16:25:00 +03:00
parent 619ed39e66
commit 586e8359a5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/manageStakeholders/manageStakeholders.component.html
View File

@ -129,4 +129,4 @@
<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
</div>
</modal-alert>
<modal-alert #deleteStakeholderModal (alertOutput)="deleteStakeholder()"></modal-alert>
<modal-alert #deleteStakeholderModal [overflowBody]="false" (alertOutput)="deleteStakeholder()"></modal-alert>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit d01ba65537a812708ace0c578a5b28dfc48abd12
Subproject commit 65eb622653582d5021d64a2b1508b6c368381e21

9
src/app/utils/adminDashboard.guard.ts
View File

@ -27,10 +27,11 @@ export class AdminDashboardGuard implements CanActivate, CanActivateChild {
return zip(
this.userManagementService.getUserInfo(false)
,this.stakeholderService.getStakeholder(alias)
).pipe(take(1),map(res =>{
return res[0] && res[1] && (Session.isPortalAdministrator(res[0]) ||
Session.isCurator(res[1].type, res[0]) || Session.isManager(res[1].type, res[1].alias, res[0]));
}),tap(authorized => {
).pipe(take(1),map(res =>
res[0] && res[1] && (Session.isPortalAdministrator(res[0]) ||
Session.isCurator(res[1].type, res[0]) || Session.isManager(res[1].type, res[1].alias, res[0]))
),tap(authorized => {
console.log(authorized);
if(!authorized){
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_ADMIN, 'redirectUrl':path}});
}