From f435cdd3032db5e5c5a7f07184dc3d6d0b4d1ce3 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 11 Jun 2021 17:57:19 +0300 Subject: [PATCH] user can self assign to unassigned documents --- apps/red-ui/src/app/services/permissions.service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index c9afaf879..78cbb68cd 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -79,8 +79,11 @@ export class PermissionsService { if (precondition) { if ( - (fileStatus.isUnassigned || (fileStatus.isUnderReview && !this.isFileReviewer())) && - (this.isApprover() || isTheOnlyReviewer) + (fileStatus.isUnassigned || + (fileStatus.isUnderReview && !this.isFileReviewer(fileStatus))) && + (this.isApprover() || + isTheOnlyReviewer || + (this.isDossierReviewer() && fileStatus.isUnassigned)) ) { return true; } @@ -134,7 +137,7 @@ export class PermissionsService { return dossier?.approverIds.indexOf(user.id) >= 0; } - isReviewer(dossier = this._activeDossier, user = this.currentUser): boolean { + isDossierReviewer(dossier = this._activeDossier, user = this.currentUser): boolean { return this.isDossierMember(dossier, user) && !this.isApprover(dossier, user); }