From 779dd070b74295b2ea32b7bc90b7c89222937986 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 20 Mar 2023 11:44:04 +0100 Subject: [PATCH] (bug) undefined local variable or method 'reservation_deadline' (quality) linted code --- app/models/cart_item/event_reservation.rb | 2 +- app/models/cart_item/machine_reservation.rb | 2 +- app/models/cart_item/reservation.rb | 7 +++---- app/models/cart_item/space_reservation.rb | 2 +- app/models/cart_item/training_reservation.rb | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/models/cart_item/event_reservation.rb b/app/models/cart_item/event_reservation.rb index 342cff6a2..c2dd29824 100644 --- a/app/models/cart_item/event_reservation.rb +++ b/app/models/cart_item/event_reservation.rb @@ -73,6 +73,6 @@ class CartItem::EventReservation < CartItem::Reservation end def reservation_deadline_minutes - return Setting.get('event_reservation_deadline').to_i + Setting.get('event_reservation_deadline').to_i end end diff --git a/app/models/cart_item/machine_reservation.rb b/app/models/cart_item/machine_reservation.rb index 456dad4cf..9fccf8911 100644 --- a/app/models/cart_item/machine_reservation.rb +++ b/app/models/cart_item/machine_reservation.rb @@ -51,6 +51,6 @@ class CartItem::MachineReservation < CartItem::Reservation end def reservation_deadline_minutes - return Setting.get('machine_reservation_deadline').to_i + Setting.get('machine_reservation_deadline').to_i end end diff --git a/app/models/cart_item/reservation.rb b/app/models/cart_item/reservation.rb index 533de497e..f7f38455e 100644 --- a/app/models/cart_item/reservation.rb +++ b/app/models/cart_item/reservation.rb @@ -244,11 +244,10 @@ class CartItem::Reservation < CartItem::BaseItem operator.admin? end - ## # Gets the deadline in minutes for slots in this reservation - ## + # @return [Integer] def reservation_deadline_minutes - return 0 + 0 end # @param reservation_slot [CartItem::ReservationSlot] @@ -274,7 +273,7 @@ class CartItem::Reservation < CartItem::BaseItem end if slot.start_at < reservation_deadline_minutes.minutes.since && !operator.privileged? - errors.add(:slot, I18n.t('cart_item_validation.deadline', { MINUTES: reservation_deadline })) + errors.add(:slot, I18n.t('cart_item_validation.deadline', { MINUTES: reservation_deadline_minutes })) return false end diff --git a/app/models/cart_item/space_reservation.rb b/app/models/cart_item/space_reservation.rb index 5105fb433..aa513c3b8 100644 --- a/app/models/cart_item/space_reservation.rb +++ b/app/models/cart_item/space_reservation.rb @@ -36,6 +36,6 @@ class CartItem::SpaceReservation < CartItem::Reservation end def reservation_deadline_minutes - return Setting.get('space_reservation_deadline').to_i + Setting.get('space_reservation_deadline').to_i end end diff --git a/app/models/cart_item/training_reservation.rb b/app/models/cart_item/training_reservation.rb index c7255cd77..aff64b3a6 100644 --- a/app/models/cart_item/training_reservation.rb +++ b/app/models/cart_item/training_reservation.rb @@ -47,6 +47,6 @@ class CartItem::TrainingReservation < CartItem::Reservation end def reservation_deadline_minutes - return Setting.get('training_reservation_deadline').to_i + Setting.get('training_reservation_deadline').to_i end end