diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dc222f5a..df271d8b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Changelog Fab-manager +- Fix a bug: unable to show the daily view of the public agenda, if it contains trainings or events + ## v5.4.19 2022 September 13 -- Fix a bug: comput the wallet amount that can't apply coupon +- Fix a bug: computing the wallet amount to debit ignores the applied coupon ## v5.4.18 2022 September 12 diff --git a/app/views/api/availabilities/public.json.jbuilder b/app/views/api/availabilities/public.json.jbuilder index 7add5228c..9720b430d 100644 --- a/app/views/api/availabilities/public.json.jbuilder +++ b/app/views/api/availabilities/public.json.jbuilder @@ -49,10 +49,10 @@ json.array!(@availabilities) do |availability| json.borderColor space_slot_border_color(availability) when 'training' json.training_id availability.availability.trainings.first.id - json.borderColor trainings_events_border_color(availability) + json.borderColor trainings_events_border_color(availability.availability) when 'event' json.event_id availability.availability.event.id - json.borderColor trainings_events_border_color(availability) + json.borderColor trainings_events_border_color(availability.availability) else json.title 'Unknown slot' end