Fix modal heights for all dashboard pages
This commit is contained in:
parent
619ed39e66
commit
586e8359a5
|
@ -129,4 +129,4 @@
|
||||||
<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
|
<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
|
||||||
</div>
|
</div>
|
||||||
</modal-alert>
|
</modal-alert>
|
||||||
<modal-alert #deleteStakeholderModal (alertOutput)="deleteStakeholder()"></modal-alert>
|
<modal-alert #deleteStakeholderModal [overflowBody]="false" (alertOutput)="deleteStakeholder()"></modal-alert>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d01ba65537a812708ace0c578a5b28dfc48abd12
|
Subproject commit 65eb622653582d5021d64a2b1508b6c368381e21
|
|
@ -27,10 +27,11 @@ export class AdminDashboardGuard implements CanActivate, CanActivateChild {
|
||||||
return zip(
|
return zip(
|
||||||
this.userManagementService.getUserInfo(false)
|
this.userManagementService.getUserInfo(false)
|
||||||
,this.stakeholderService.getStakeholder(alias)
|
,this.stakeholderService.getStakeholder(alias)
|
||||||
).pipe(take(1),map(res =>{
|
).pipe(take(1),map(res =>
|
||||||
return res[0] && res[1] && (Session.isPortalAdministrator(res[0]) ||
|
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]));
|
Session.isCurator(res[1].type, res[0]) || Session.isManager(res[1].type, res[1].alias, res[0]))
|
||||||
}),tap(authorized => {
|
),tap(authorized => {
|
||||||
|
console.log(authorized);
|
||||||
if(!authorized){
|
if(!authorized){
|
||||||
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_ADMIN, 'redirectUrl':path}});
|
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_ADMIN, 'redirectUrl':path}});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue