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

Change ol to ul in error message of role verifcation and fix a bug with toggle item with no subitems in sidebar

This commit is contained in:
Konstantinos Triantafyllou 2022-12-10 01:56:56 +02:00
parent 2492f737b8
commit 4afcb8f27f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/sharedComponents/sidebar/sideBar.component.ts
View File

@ -25,7 +25,9 @@ export class SideBarComponent implements AfterViewInit {
ngAfterViewInit() { ngAfterViewInit() {
if(this.nav) { if(this.nav) {
setTimeout(() => { setTimeout(() => {
UIkit.nav(this.nav.nativeElement).toggle(this.activeIndex, true); if(this.items[this.activeIndex].items.length > 0) {
UIkit.nav(this.nav.nativeElement).toggle(this.activeIndex, true);
}
}); });
} }
} }

9
role-verification/role-verification.component.ts
View File

@ -63,11 +63,11 @@ import {Composer} from "../utils/email/composer";
<modal-alert #errorModal (alertOutput)="cancel()" [overflowBody]="false"> <modal-alert #errorModal (alertOutput)="cancel()" [overflowBody]="false">
<div> <div>
We are unable to process the request. What happened? We are unable to process the request. What happened?
<ol> <ul class="uk-margin-top uk-list uk-list-circle uk-list-primary">
<li>You are logged in with <a [routerLink]="[userInfoLinkPrefix + '/user-info']" (click)="errorModal.cancel()">a different email</a>, than the one you have received the invitation.</li> <li>You are logged in with <a [routerLink]="[userInfoLinkPrefix + '/user-info']" (click)="errorModal.cancel()">a different email</a>, than the one you have received the invitation.</li>
<li>The invitation has been canceled.</li> <li>The invitation has been canceled.</li>
<li>The URL is invalid.</li> <li>The URL is invalid.</li>
</ol> </ul>
</div> </div>
</modal-alert> </modal-alert>
` `
@ -133,11 +133,12 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
this.openErrorModal(); this.openErrorModal();
})); }));
} else { } else {
this.router.navigate(['/user-info'], { this.router.navigate(['user-info'], {
queryParams: { queryParams: {
'errorCode': LoginErrorCodes.NOT_LOGIN, 'errorCode': LoginErrorCodes.NOT_LOGIN,
'redirectUrl': this.router.url 'redirectUrl': this.router.url
} },
relativeTo: this.route
}); });
} }
} }