From 0803eb0833e32c77c2390d41dabde0024ad88513 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Thu, 26 Oct 2023 14:35:18 +0200
Subject: [PATCH] (bug) pre-registration event reservations ilimit places

---
 CHANGELOG.md                                          | 1 +
 app/frontend/src/javascript/controllers/events.js.erb | 3 ---
 app/frontend/templates/admin/events/reservations.html | 2 +-
 app/models/slots_reservation.rb                       | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e498e5495..d412793c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix a bug: fix all failing tasks of rake task file chain.rake
 - Fix a bug: file_size_validator.rb was broken since ruby v3, see https://github.com/rails/rails/issues/41270
+- improvement: pre-registration event reservations ilimit places
 - decreases sidekiq concurrency from 25 to 5, 25 is too much and consumes memory for nothing
 - do not log Notifications#polling action anymore, by default, can be enable via env variable ENABLE_NOTIFICATIONS_POLLING_LOGGING=true
 
diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb
index 7c0eab0e7..376a6378e 100644
--- a/app/frontend/src/javascript/controllers/events.js.erb
+++ b/app/frontend/src/javascript/controllers/events.js.erb
@@ -1023,9 +1023,6 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
         });
         resetEventReserve();
       });
-      if ($scope.currentUser.role === 'admin') {
-        return $scope.ctrl.member = null;
-      }
     };
 
     /**
diff --git a/app/frontend/templates/admin/events/reservations.html b/app/frontend/templates/admin/events/reservations.html
index 69590232c..2c677caae 100644
--- a/app/frontend/templates/admin/events/reservations.html
+++ b/app/frontend/templates/admin/events/reservations.html
@@ -60,7 +60,7 @@
                 <div ng-if="!isCancelled(reservation) && !reservation.is_paid">
                   <label class="m-r-sm">
                     <span translate>{{ 'app.admin.event_reservations.negative' }}</span>
-                    <input type="radio" name="invalidate-{{reservation.id}}" ng-value="false" ng-click="invalidateReservation(reservation)" ng-model="reservation.slots_reservations_attributes[0].is_valid" ng-disabled="reservation.total_booked_seats > event.nb_free_places && !reservation.slots_reservations_attributes[0].is_valid">
+                    <input type="radio" name="invalidate-{{reservation.id}}" ng-value="false" ng-click="invalidateReservation(reservation)" ng-model="reservation.slots_reservations_attributes[0].is_valid" ng-disabled="reservation.slots_reservations_attributes[0].is_valid === 'false'">
                   </label>
                   <label>
                     <span translate>{{ 'app.admin.event_reservations.affirmative' }}</span>
diff --git a/app/models/slots_reservation.rb b/app/models/slots_reservation.rb
index 030eb55ff..f81ef4c59 100644
--- a/app/models/slots_reservation.rb
+++ b/app/models/slots_reservation.rb
@@ -69,7 +69,7 @@ class SlotsReservation < ApplicationRecord
       Slots::PlacesCacheService.change_places(target_slot,
                                               reservation.reservable_type,
                                               reservation.reservable_id,
-                                              reservation.total_booked_seats,
+                                              reservation.reservable.pre_registration ? 0 : reservation.total_booked_seats,
                                               operation)
     else
       Slots::PlacesCacheService.change_places(target_slot, reservation.reservable_type, reservation.reservable_id, 1, operation)