MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/angular-13' into angular-14

This commit is contained in:
Konstantinos Triantafyllou 2022-09-28 11:14:43 +03:00
parent cae2bcec86 2d2c9748bf
commit 31248e7a18
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
claims/claim-utils/displayClaims/displayClaims.component.html
View File

@ -3,7 +3,7 @@
<div class="uk-width-expand uk-position-relative">
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
[texts]="pageContents['top']"></helper>
<div *ngIf="filterForm" [id]="actions?'page_content_actions':null" [attr.uk-sticky]="(actions)?'media: @m':null" [attr.offset]="offset">
<div *ngIf="filterForm" [id]="actions?'page_content_actions':null" [class.uk-blur-background]="actions" [attr.uk-sticky]="(actions)?'media: @m':null" [attr.offset]="offset">
<div [class.uk-padding-small]="actions" class="uk-padding-remove-vertical">
<div class="uk-section-xsmall">
<div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle">

1
connect/communityGuard/connectAdminLoginGuard.guard.ts
View File

@ -24,6 +24,7 @@ export class ConnectAdminLoginGuard implements CanActivate, CanActivateChild {
let errorCode = LoginErrorCodes.NOT_LOGIN;
const authorized = this.userManagementService.getUserInfo().pipe(take(1), map(user => {
if (user) {
errorCode = LoginErrorCodes.NOT_ADMIN;
if (Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager('community', community, user)) {
return of(true);
}