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

assign reviewer for approvers

Browse Source
This commit is contained in:
Dan Percic 2021-05-28 14:09:14 +03:00
parent 351dc05384
commit e305a461cf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
View File

@ -72,7 +72,8 @@
*ngIf=" *ngIf="
!editingReviewer && !editingReviewer &&
!appStateService.activeFile.currentReviewer && !appStateService.activeFile.currentReviewer &&
permissionsService.canAssignUser() permissionsService.canAssignUser() &&
appStateService.activeProject.hasMoreThanOneReviewer
" "
class="assign-reviewer pointer" class="assign-reviewer pointer"
translate="file-preview.assign-reviewer" translate="file-preview.assign-reviewer"

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

@ -114,12 +114,13 @@ export class PermissionsService {
!fileStatus.isError && !fileStatus.isError &&
!fileStatus.isApproved; !fileStatus.isApproved;
const isNotCurrentReviewer = fileStatus.currentReviewer !== this._userService.userId;
const isTheOnlyReviewer = !this._appStateService.activeProject.hasMoreThanOneReviewer;
if (precondition) { if (precondition) {
if ( if (
(fileStatus.isUnassigned || fileStatus.isUnderReview) && (fileStatus.isUnassigned || (fileStatus.isUnderReview && isNotCurrentReviewer)) &&
(!this.isApprover() || (this.isApprover() || isTheOnlyReviewer)
!this._appStateService.activeProject.hasMoreThanOneReviewer) &&
fileStatus.currentReviewer !== this._userService.userId
) { ) {
return true; return true;
} }