From e3b62df7d48407b2f7636121350d82569a6c8a39 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Sep 2022 09:57:54 +0200 Subject: [PATCH] (bug) admin can't move/cancel event reservation --- CHANGELOG.md | 1 + app/frontend/src/javascript/controllers/events.js.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef3db6c9..60944d13d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab-manager - Script to download translations from Crowdin +- Fix a bug: admin and managers can't cancel or move event reservations ## v5.4.17 2022 September 06 diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb index c7957ca3f..d933bc438 100644 --- a/app/frontend/src/javascript/controllers/events.js.erb +++ b/app/frontend/src/javascript/controllers/events.js.erb @@ -483,6 +483,8 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' * @param reservation {Reservation} */ $scope.reservationCanModify = function (reservation) { + if (AuthService.isAuthorized(['admin', 'manager'])) return true; + const slotStart = moment(reservation.slots_reservations_attributes[0].slot_attributes.start_at); const now = moment(); @@ -498,6 +500,8 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' * @param reservation {Reservation} */ $scope.reservationCanCancel = function(reservation) { + if (AuthService.isAuthorized(['admin', 'manager'])) return true; + const slotStart = moment(reservation.slots_reservations_attributes[0].slot_attributes.start_at); const now = moment(); return $scope.enableBookingCancel && slotStart.diff(now, "hours") >= $scope.cancelBookingDelay;