rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

fix training reservation calendar witch shows all trainings slots

Browse Source
This commit is contained in:
Sylvain 2016-11-29 15:48:39 +01:00
parent 852437ebf8
commit b75cbc17d7
2 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: misconfigured Twitter's ENV variables results in HTTP error 500 - Fix a bug: misconfigured Twitter's ENV variables results in HTTP error 500
- Fix a bug: wallet is not debited when paying locally with a user who have invoices disabled - Fix a bug: wallet is not debited when paying locally with a user who have invoices disabled
- Fix a bug: wrong error message about rounding inconsistency is logged on invoice generation - Fix a bug: wrong error message about rounding inconsistency is logged on invoice generation
- Fix a bug: reservation calendar of a specific training shows availabilities for all trainings
## v2.4.4 2016 November 24 ## v2.4.4 2016 November 24

4
app/controllers/api/availabilities_controller.rb
View File

@ -126,8 +126,8 @@ class API::AvailabilitiesController < API::ApiController
# what is requested? # what is requested?
# 1) a single training # 1) a single training
if params[:training_id].is_number? if params[:training_id].is_number? or (params[:training_id].length > 0 and params[:training_id] != 'all')
@availabilities = Training.find(params[:training_id]).availabilities @availabilities = Training.friendly.find(params[:training_id]).availabilities
# 2) all trainings # 2) all trainings
else else
@availabilities = Availability.trainings @availabilities = Availability.trainings