-
-
User Information
@@ -19,13 +17,13 @@
1">
Roles {{getTheRolesFormatted(user.role)}}
-
@@ -33,25 +31,6 @@
-
The requested page requires authentication.
Please sign in to continue.
@@ -68,10 +47,7 @@
There is no research community selected.
-
0" class="uk-alert uk-alert-danger">{{errorMessage}}
-
-
diff --git a/login/user.component.ts b/login/user.component.ts
index 1f6ee1d8..1fcdc867 100644
--- a/login/user.component.ts
+++ b/login/user.component.ts
@@ -99,8 +99,12 @@ export class UserComponent {
}
return formattedRoles.join(", ");
}
+
+ get isCurator() {
+ return Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user);
+ }
- isUserManager() {
+ get isUserManager() {
return Session.isUserManager(this.user);
}
diff --git a/login/userMiniModule.module.ts b/login/userMiniModule.module.ts
index f8af2807..b48df909 100644
--- a/login/userMiniModule.module.ts
+++ b/login/userMiniModule.module.ts
@@ -5,6 +5,8 @@ import { RouterModule } from "@angular/router";
import {UserMiniComponent} from "./userMini.component";
import {IconsModule} from "../utils/icons/icons.module";
+import {IconsService} from "../utils/icons/icons.service";
+import {login} from "../utils/icons/icons";
@NgModule({
imports: [
@@ -19,4 +21,7 @@ import {IconsModule} from "../utils/icons/icons.module";
]
})
export class UserMiniModule {
+ constructor(private iconsService: IconsService) {
+ this.iconsService.registerIcons([login])
+ }
}
diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts
index bb7f61fa..1eb7e836 100644
--- a/role-verification/role-verification.component.ts
+++ b/role-verification/role-verification.component.ts
@@ -62,13 +62,17 @@ import {Composer} from "../utils/email/composer";
- We are unable to process the request because the link is invalid, or it has expired.
+ We are unable to process the request. What happened?
+
+ - You are logged in with a different email, than the one you have received the invitation.
+ - The invitation has been canceled.
+ - The URL is invalid.
+
`
})
export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewInit {
-
@Input()
public id: string;
@Input()
@@ -77,6 +81,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
public name: string;
@Input()
public service: "connect" | "monitor" = "monitor";
+ @Input()
+ public userInfoLinkPrefix = '';
public user: User;
public verification: any;
public code: UntypedFormControl;
diff --git a/role-verification/role-verification.module.ts b/role-verification/role-verification.module.ts
index ffc66714..0a39dfdb 100644
--- a/role-verification/role-verification.module.ts
+++ b/role-verification/role-verification.module.ts
@@ -6,9 +6,10 @@ import {ReactiveFormsModule} from "@angular/forms";
import {LoadingModule} from "../utils/loading/loading.module";
import {InputModule} from "../sharedComponents/input/input.module";
import {EmailService} from "../utils/email/email.service";
+import {RouterModule} from "@angular/router";
@NgModule({
- imports: [CommonModule, AlertModalModule, ReactiveFormsModule, LoadingModule, InputModule],
+ imports: [CommonModule, AlertModalModule, ReactiveFormsModule, LoadingModule, InputModule, RouterModule],
declarations: [RoleVerificationComponent],
exports: [RoleVerificationComponent],
providers: [EmailService]
diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts
index ebd3ff0f..fb4fab03 100644
--- a/utils/icons/icons.ts
+++ b/utils/icons/icons.ts
@@ -107,4 +107,9 @@ export const newsletter = {
name: 'newsletter',
data: '
'
}
+
+export const login = {
+ name: 'login',
+ data: '
'
+}
/** Add new icon under this line to be sure that it will be added on preview */