rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-26 20:54:21 +01:00
Code Issues Releases Activity

(bug) unable to hide the slot of event deleted in agenda

Browse Source
This commit is contained in:
Du Peng 2024-04-29 11:14:12 +02:00
parent 5f917ec1e8
commit 170b1fd2ae
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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: 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: 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 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 ## v6.3.20 2024 Avril 15

2
app/services/availabilities/availabilities_service.rb
View File

@ -19,7 +19,7 @@ class Availabilities::AvailabilitiesService
spaces_availabilities = Setting.get('spaces_module') ? spaces(Space.where(id: ids[:spaces]), @current_user, window) : [] 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) : [] 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_availabilities = if events && Setting.get('events_in_calendar')
events(Event.all, @current_user, window) events(Event.where(deleted_at: nil), @current_user, window)
else else
[] []
end end

2
app/services/availabilities/public_availabilities_service.rb
View File

@ -21,7 +21,7 @@ class Availabilities::PublicAvailabilitiesService
else else
[] []
end 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) [].concat(trainings_slots).concat(events_slots).concat(machines_slots).concat(spaces_slots)
end end