From af57e59ccdc74d5fa8ed0546de9b931ce6fb8c57 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Wed, 26 Jul 2023 16:10:05 +0200
Subject: [PATCH 1/2] (bug) event canceled places error

---
 CHANGELOG.md                            | 1 +
 app/frontend/templates/events/show.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85fdc1ed0..ee58ecb79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog Fab-manager
 
 - Fix a bug: event reserved places compute error
+- Fix a bug: event canceled places error
 - [TODO DEPLOY] `rails fablab:setup:build_places_cache`
 
 ## v6.0.11 2023 July 21
diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html
index ec362a3d5..3d81d5213 100644
--- a/app/frontend/templates/events/show.html
+++ b/app/frontend/templates/events/show.html
@@ -168,7 +168,7 @@
               </div>
             </div>
             <div ng-show="isCancelled(reservation)" class="well well-disabled">
-              <div class="text-italic text-sm">{{ 'app.public.events_show.canceled_reservation_SEATS' | translate:{SEATS:reservation.total_booked_seats} }}</div>
+              <div class="text-italic text-sm">{{ 'app.public.events_show.canceled_reservation_SEATS' | translate:{SEATS:reservation.nb_reserve_places} }}</div>
             </div>
           </div>
 

From 31394307618ff0e3147ffa51dd1414e6588fcfb1 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@sleede.com>
Date: Fri, 28 Jul 2023 10:35:36 +0200
Subject: [PATCH 2/2] (ui) Fix select dropdown z-index

---
 app/frontend/src/stylesheets/modules/form/form-select.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/frontend/src/stylesheets/modules/form/form-select.scss b/app/frontend/src/stylesheets/modules/form/form-select.scss
index 73aa63a33..746083bac 100644
--- a/app/frontend/src/stylesheets/modules/form/form-select.scss
+++ b/app/frontend/src/stylesheets/modules/form/form-select.scss
@@ -1,4 +1,5 @@
 .form-select {
+  .rs__menu { z-index: 20; }
   .rs__menu .rs__menu-list {
     .rs__option {
       &--is-disabled {