diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 9563eff9..5b963e6f 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -38,7 +38,7 @@ import {StringUtils} from "../utils/string-utils.class"; (alertOutput)="verifyMember()" [okDisabled]="(code.invalid || loading)">
- You have been invited to join {{name}} {{(dashboard)}} as a {{stakeholderUtils.roles.member}}. + You have been invited to join {{name}} {{(dashboard)}} Dashboard as a {{stakeholderUtils.roles.member}}. Fill in the verification code, sent to your email, to accept the invitation request.
@@ -115,6 +115,11 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, } ngAfterViewInit() { + this.init(); + } + + init() { + this.ngOnDestroy(); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.paramsSubscription = this._route.queryParams.subscribe(params => { @@ -239,6 +244,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, this.loading = true; this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => { this.clearCacheService.clearCache('Members updated'); + this.memberModal.cancel(); this.loading = false; this.error = null; this.userManagementService.updateUserInfo(() => { @@ -258,6 +264,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, } cancel() { - this._router.navigate([]); + this._router.navigate([], {relativeTo: this.relativeTo}); + this.init(); } }