mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2024-11-28 09:24:24 +01:00
(bug) unable to hide the slot of event deleted in agenda
This commit is contained in:
parent
5f917ec1e8
commit
170b1fd2ae
@ -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
|
||||
|
||||
|
@ -19,7 +19,7 @@ class Availabilities::AvailabilitiesService
|
||||
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
|
||||
|
@ -21,7 +21,7 @@ class Availabilities::PublicAvailabilitiesService
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user