117287: Simplified the if conditions on the edit/save/discard buttons on item versions

(cherry picked from commit 04bbaf9cb9)
This commit is contained in:
Alexandre Vryghem
2024-08-14 23:43:44 +02:00
parent db4ea14289
commit e30bfffbf0

View File

@@ -49,38 +49,36 @@
</ng-template> </ng-template>
</div> </div>
<div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions"> <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
<!--DISCARD EDIT --> <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
<ng-container *ngIf="(versionDTO.canEditVersion | async) && isThisBeingEdited(versionDTO.version)"> <!--DISCARD EDIT-->
<button class="btn btn-sm" <button class="btn btn-sm btn-outline-warning"
[ngClass]="isThisBeingEdited(versionDTO.version) ? 'btn-outline-warning' : 'btn-outline-primary'"
(click)="disableVersionEditing()" (click)="disableVersionEditing()"
title="{{'item.version.history.table.action.discardSummary' | translate}}"> title="{{'item.version.history.table.action.discardSummary' | translate}}">
<i class="fas fa-undo-alt fa-fw"></i> <i class="fas fa-undo-alt fa-fw"></i>
</button> </button>
</ng-container> <!--SAVE-->
<!--EDIT / SAVE-->
<ng-container *ngIf="versionDTO.canEditVersion | async">
<button class="btn btn-outline-primary btn-sm version-row-element-edit"
*ngIf="!isThisBeingEdited(versionDTO.version)"
[disabled]="isAnyBeingEdited()"
(click)="enableVersionEditing(versionDTO.version)"
title="{{'item.version.history.table.action.editSummary' | translate}}">
<i class="fas fa-edit fa-fw"></i>
</button>
<button class="btn btn-outline-success btn-sm" <button class="btn btn-outline-success btn-sm"
*ngIf="isThisBeingEdited(versionDTO.version)"
(click)="onSummarySubmit()" (click)="onSummarySubmit()"
title="{{'item.version.history.table.action.saveSummary' | translate}}"> title="{{'item.version.history.table.action.saveSummary' | translate}}">
<i class="fas fa-check fa-fw"></i> <i class="fas fa-check fa-fw"></i>
</button> </button>
</ng-container> </ng-container>
<ng-template #notThisBeingEdited>
<!--EDIT-->
<button class="btn btn-outline-primary btn-sm version-row-element-edit"
[disabled]="isAnyBeingEdited()"
(click)="enableVersionEditing(versionDTO.version)"
title="{{'item.version.history.table.action.editSummary' | translate}}">
<i class="fas fa-edit fa-fw"></i>
</button>
</ng-template>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div>*&nbsp;{{ "item.version.history.selected" | translate }}</div> <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
</ds-pagination> </ds-pagination>
</div> </div>
</div> </div>