Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-8083' into 'master'

Browse Source 
RED-8083: fixed reviewer cannot assign approver.

See merge request redactmanager/red-ui!238
This commit is contained in:
Dan Percic 2023-12-20 14:40:40 +01:00
commit ed28fe911f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/shared-dossiers/services/file-assign.service.ts
View File

@ -81,6 +81,10 @@ export class FileAssignService {
userId = eligibleUsersIds[0];
}
if (targetStatus === WorkflowFileStatuses.UNDER_APPROVAL && eligibleUsersIds.length === 1 && !userId) {
userId = eligibleUsersIds[0];
}
if (userId) {
return this.#makeAssignFileRequest(userId, targetStatus, [file]);
}

2
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -508,7 +508,7 @@ export class PermissionsService {
#canAssignApprover(file: File, dossier: Dossier) {
const fileStatesForApprover = file.isUnderReview || file.isUnderApproval || file.isApproved;
return fileStatesForApprover && dossier.hasApprovers && this.isApprover(dossier);
return fileStatesForApprover && dossier.hasApprovers && this.isDossierMember(dossier);
}
#canUnassignUser(file: File, dossier: Dossier) {

2
libs/red-domain/src/lib/dossiers/dossier.model.ts
View File

@ -51,7 +51,7 @@ export class Dossier implements IDossier, IListable {
this.watermarkId = dossier.watermarkId;
this.previewWatermarkId = dossier.previewWatermarkId;
this.archivedTime = dossier.archivedTime;
this.hasApprovers = !!this.approverIds && this.approverIds.length > 1;
this.hasApprovers = !!this.approverIds && this.approverIds.length >= 1;
this.isSoftDeleted = this.softDeletedTime !== null;
this.isArchived = this.archivedTime !== null;