Merge branch 'dev' for release 6.0.12

sleede · Aug 14, 2023 · 1e862d5 · 1e862d5
2 parents 0597c98 + 5263153
commit 1e862d5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog Fab-manager
 
+## v6.0.12 2023 August 14
+
+- Fix a bug: event reserved places compute error
+- Fix a bug: event canceled places error
+- Fix a bug: 403 error when manager edit an event
+- Fix a bug: unable to show projects next page button
+- [TODO DEPLOY] `rails fablab:setup:build_places_cache`
+
 ## v6.0.11 2023 July 21
 
 - Fix a bug: incorrect date range in statistics

diff --git 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 {

diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html
@@ -168,7 +168,7 @@ <h5>{{event.category.name}}</h5>
               </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>
 

diff --git a/app/policies/setting_policy.rb b/app/policies/setting_policy.rb
@@ -46,7 +46,7 @@ def self.public_whitelist
        external_id machines_banner_active machines_banner_text machines_banner_cta_active machines_banner_cta_label
        machines_banner_cta_url trainings_banner_active trainings_banner_text trainings_banner_cta_active trainings_banner_cta_label
        trainings_banner_cta_url events_banner_active events_banner_text events_banner_cta_active events_banner_cta_label
-       events_banner_cta_url projects_list_member_filter_presence projects_list_date_filters_presence
+       events_banner_cta_url projects_list_member_filter_presence projects_list_date_filters_presence advanced_accounting
        project_categories_filter_placeholder project_categories_wording]
   end
 

diff --git a/app/services/project_service.rb b/app/services/project_service.rb
@@ -47,6 +47,6 @@ def search_from_postgre(params, current_user, paginate: true)
     records = records.includes(:users, :project_image)
     records = records.page(params[:page]) if paginate
 
-    { total: records.count, projects: records }
+    { total: records.total_count, projects: records }
   end
 end
diff --git a/app/services/slots/places_cache_service.rb b/app/services/slots/places_cache_service.rb
@@ -32,7 +32,11 @@ def refresh(slot)
 
         reserved_places = (reservations[:reservations].count || 0) + (pending[:reservations].count || 0)
         if slot.availability.available_type == 'event'
-          reserved_places = slot.availability.event.nb_total_places - slot.availability.event.nb_free_places
+          reserved_places = if slot.availability.event.nb_total_places.nil?
+                              0
+                            else
+                              slot.availability.event.nb_total_places - slot.availability.event.nb_free_places
+                            end
         end
         places.push({
                       reservable_type: reservable.class.name,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,7 +168,7 @@ <h5>{{event.category.name}}</h5> @@
                   </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>
@@ Expand Down @@