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

[Library | Trunk]: 1. Role-users: after invite go to pending tabs 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59837 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-11-13 12:51:35 +00:00
parent bbcb780ef8
commit 057e5b35ac
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard/users/dashboard-users.component.ts
View File

@ -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);
}
}

2
dashboard/users/role-users/role-users.component.html
View File

@ -55,7 +55,7 @@
<span class="uk-text-bold">{{(showActive) ? item.email : item}}</span>
</div>
</div>
<div *ngIf="properties.environment === 'development'" class="uk-width-expand">
<div *ngIf="isPortalAdmin" class="uk-width-expand">
<div class="uk-padding-small uk-padding-remove-horizontal uk-flex uk-flex-center">
<a (click)="openDeleteModal(item)" class="uk-button action uk-flex uk-flex-middle">
<icon name="remove_circle_outline" ratio="0.7" [flex]="true"></icon>

5
dashboard/users/role-users/role-users.component.ts
View File

@ -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;

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

@ -13,7 +13,7 @@ import {AlertModal} from "../utils/modal/alert";
template: `
<modal-alert #managerModal>
<div>
You have been invited to join <span class="uk-text-bold">{{name}}</span> as a manager.
You have been invited to join <span class="uk-text-bold">{{name}}</span> Monitor Dashboard as a manager.
<span class="portal-color">Fill</span> in the <span class="portal-color">verification code</span>, sent to your
email, to accept the invitation request.
</div>
@ -37,7 +37,7 @@ import {AlertModal} from "../utils/modal/alert";
<modal-alert #memberModal>
<div *ngIf="!isMember">
<div>
You have been invited to join <span class="uk-text-bold">{{name}}</span> as a member.
You have been invited to join <span class="uk-text-bold">{{name}}</span> Monitor Dashboard as a member.
<span class="portal-color">Fill</span> in the <span class="portal-color">verification code</span>, sent to
your
email, to accept the invitation request.