Skip to content

Commit 38d8452

Browse files
authored
Merge pull request #3499 from ProgrammeVitam/CP_bug_15626_master_9.0.x
CP V9.0 - Bug #15626 - [Operations Management] – Pop-ups are reversed when forcing an operation to stop, and the “Force Stop” button is incorrectly disabled.
2 parents 7be0106 + 197e42c commit 38d8452

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-preview/logbook-management-operation-preview.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113
'LOGBOOK_MANAGEMENT_OPERATION_ACTIONS.POP_UP_' +
114114
actionId +
115115
'_' +
116-
(operation?.stepCancellable ? 'FORCED' : 'NON_FORCED') +
116+
(operation?.stepCancellable ? 'NON_FORCED' : 'FORCED') +
117117
'_MODE_MESSAGE' | translate
118118
"
119119
></vitamui-dialog-header>
120120

121121
<mat-dialog-content>
122-
<div *ngIf="operation?.stepCancellable">
122+
<div *ngIf="!operation?.stepCancellable">
123123
<p>
124124
{{ 'LOGBOOK_MANAGEMENT_OPERATION_ACTIONS.POP_UP_' + actionId + '_FORCED_MODE_REASON' | translate }}
125125
</p>
@@ -133,7 +133,7 @@
133133
</div>
134134
</mat-dialog-content>
135135
<mat-dialog-actions class="dialog-action">
136-
<button [matDialogClose]="true" [disabled]="!reason.valid" class="btn primary btn-confirm-dialog">
136+
<button [matDialogClose]="true" [disabled]="!operation?.stepCancellable && !reason.valid" class="btn primary btn-confirm-dialog">
137137
{{ 'LOGBOOK_MANAGEMENT_OPERATION_ACTIONS.POP_UP_CANCEL_ACTION' | translate }}
138138
</button>
139139
<button matDialogClose class="btn cancel link">{{ 'COMMON.CANCEL' | translate }}</button>

0 commit comments

Comments
 (0)