From: Jane Sandberg Date: Mon, 1 Apr 2019 22:12:00 +0000 (-0700) Subject: LP1816475: Don't let users cancel picked up reservations X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=38882e416140e706faf2ddc13a3c768e0c2bea25;p=working%2FEvergreen.git LP1816475: Don't let users cancel picked up reservations Signed-off-by: Jane Sandberg --- diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts index 3714052384..d419c35533 100644 --- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts @@ -174,7 +174,7 @@ export class ReservationsGridComponent implements OnInit { this.noSelectedRows = (rows: IdlObject[]) => (rows.length === 0); this.notOnePatronSelected = (rows: IdlObject[]) => (new Set(rows.map(row => row.usr().id())).size !== 1); this.notOneResourceSelected = (rows: IdlObject[]) => (new Set(rows.map(row => row.current_resource().id())).size !== 1); - this.cancelNotAppropriate = (rows: IdlObject[]) => (this.noSelectedRows(rows) || ('pickedUp' === this.status)); + this.cancelNotAppropriate = (rows: IdlObject[]) => (this.noSelectedRows(rows) || ['pickedUp', 'returnReady', 'returnedToday'].includes(this.status)); this.pickupNotAppropriate = (rows: IdlObject[]) => (this.noSelectedRows(rows) || ('pickupReady' !== this.status)); this.editNotAppropriate = (rows: IdlObject[]) => (this.noSelectedRows(rows) || ('returnedToday' === this.status)); this.returnNotAppropriate = (rows: IdlObject[]) => {