diff --git a/dashboard/users/dashboard-users.component.ts b/dashboard/users/dashboard-users.component.ts index e4edc7fa..d7dfb635 100644 --- a/dashboard/users/dashboard-users.component.ts +++ b/dashboard/users/dashboard-users.component.ts @@ -33,6 +33,6 @@ export class DashboardUsersComponent implements OnInit{ } public get isPortalAdmin() { - return Session.isPortalAdministrator(this.user); + return Session.isPortalAdministrator(this.user) || Session.isCurator(this.type, this.user); } } diff --git a/dashboard/users/role-users/role-users.component.html b/dashboard/users/role-users/role-users.component.html index 2e717ae2..e18181b7 100644 --- a/dashboard/users/role-users/role-users.component.html +++ b/dashboard/users/role-users/role-users.component.html @@ -55,7 +55,7 @@ {{(showActive) ? item.email : item}} -
+
diff --git a/dashboard/users/role-users/role-users.component.ts b/dashboard/users/role-users/role-users.component.ts index 5007348e..2bd62aae 100644 --- a/dashboard/users/role-users/role-users.component.ts +++ b/dashboard/users/role-users/role-users.component.ts @@ -166,7 +166,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { } invite() { - this.loadActive = true; + this.showActive = false; + this.loadPending = true; let details = { name: this.name, link: this.link @@ -176,7 +177,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { if (!this.pending.includes(this.invited.value)) { this.pending.push(this.invited.value); } - this.loadActive = false; + this.loadPending = false; }, error => { this.error = error.error.response; this.loadActive = false; diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 95ca6479..554c169c 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -13,7 +13,7 @@ import {AlertModal} from "../utils/modal/alert"; template: `
- You have been invited to join {{name}} as a manager. + You have been invited to join {{name}} Monitor Dashboard as a manager. Fill in the verification code, sent to your email, to accept the invitation request.
@@ -37,7 +37,7 @@ import {AlertModal} from "../utils/modal/alert";
- You have been invited to join {{name}} as a member. + You have been invited to join {{name}} Monitor Dashboard as a member. Fill in the verification code, sent to your email, to accept the invitation request.