diff --git a/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.html b/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.html index 816fbf35c532eb3090eccff247a303df6150631a..56fc20264dbfb61d491da90214913330c36f4813 100644 --- a/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.html +++ b/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.html @@ -233,7 +233,7 @@ *ngIf="!isNotReviewMode || hasReviewPermission" color="primary" matTooltip="{{ 'document.edit.panel.tooltip.version.review.approve' | translate }}" - [disabled]="reviewActionButtonDisabled" + [disabled]="reviewApproveButtonDisabled" (click)="onApproveButtonClicked()"> <mat-icon>check_circle</mat-icon> <span>{{ "document.edit.panel.button.version.review.approve" | translate }}</span> @@ -241,7 +241,7 @@ <button mat-raised-button color="primary" matTooltip="{{ 'document.edit.panel.tooltip.version.review.reject' | translate }}" - [disabled]="reviewActionButtonDisabled" + [disabled]="reviewRejectButtonDisabled" (click)="onRejectButtonClicked()"> <mat-icon>unpublished</mat-icon> <span>{{ "document.edit.panel.button.version.review.reject" | translate }}</span> diff --git a/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.ts b/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.ts index 121058383b02a6aef1c8e2897d8937aa9253fd02..9c2a71c4f91d2fb0326ccedcab5bca686e1b3d63 100644 --- a/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.ts +++ b/smp-angular/src/app/common/panels/document-edit-panel/document-edit-panel.component.ts @@ -750,11 +750,17 @@ export class DocumentEditPanelComponent implements BeforeLeaveGuard, OnInit { || this.isDirty(); } - get reviewActionButtonDisabled(): boolean { + get reviewApproveButtonDisabled(): boolean { return !this.reviewEnabled || this.documentForm.controls['documentVersionStatus']?.value !== DocumentVersionsStatus.UNDER_REVIEW } + get reviewRejectButtonDisabled(): boolean { + let status = this.documentForm.controls['documentVersionStatus']?.value + return !this.reviewEnabled + || status !== DocumentVersionsStatus.UNDER_REVIEW && status !== DocumentVersionsStatus.APPROVED; + } + get publishButtonDisabled(): boolean { // can not publish changed document if (this.isDirty()) {