From 170b1fd2ae10bd543d032fa2ce96439b657e7254 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Mon, 29 Apr 2024 11:14:12 +0200 Subject: [PATCH] (bug) unable to hide the slot of event deleted in agenda --- CHANGELOG.md | 1 + app/services/availabilities/availabilities_service.rb | 2 +- app/services/availabilities/public_availabilities_service.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08d5b774e..4d912ca2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fix a bug: availability slot date error in calendar when user pc timezone is different from server timezone - Fix a bug: expiration_date of a subscription is not correct in the OpenAPI - Fix a bug: unable to filter by date in the Subscription OpenAPI +- Fix a bug: unable to hide the slot of event deleted in agenda ## v6.3.20 2024 Avril 15 diff --git a/app/services/availabilities/availabilities_service.rb b/app/services/availabilities/availabilities_service.rb index c870fd1d3..258a9fa14 100644 --- a/app/services/availabilities/availabilities_service.rb +++ b/app/services/availabilities/availabilities_service.rb @@ -19,7 +19,7 @@ def index(window, ids, events: false) spaces_availabilities = Setting.get('spaces_module') ? spaces(Space.where(id: ids[:spaces]), @current_user, window) : [] trainings_availabilities = Setting.get('trainings_module') ? trainings(Training.where(id: ids[:trainings]), @current_user, window) : [] events_availabilities = if events && Setting.get('events_in_calendar') - events(Event.all, @current_user, window) + events(Event.where(deleted_at: nil), @current_user, window) else [] end diff --git a/app/services/availabilities/public_availabilities_service.rb b/app/services/availabilities/public_availabilities_service.rb index bb0485ec3..47f341b8d 100644 --- a/app/services/availabilities/public_availabilities_service.rb +++ b/app/services/availabilities/public_availabilities_service.rb @@ -21,7 +21,7 @@ def public_availabilities(window, ids, events: false) else [] end - events_slots = events ? service.events(Event.all, @current_user, window) : [] + events_slots = events ? service.events(Event.where(deleted_at: nil), @current_user, window) : [] [].concat(trainings_slots).concat(events_slots).concat(machines_slots).concat(spaces_slots) end