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

rename a variable

Browse Source
This commit is contained in:
Peng DU 2016-06-29 12:47:45 +02:00
parent 68e1b959ff
commit a67320121c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ class API::AvailabilitiesController < API::ApiController
start_date = ActiveSupport::TimeZone[params[:timezone]].parse(params[:start])
end_date = ActiveSupport::TimeZone[params[:timezone]].parse(params[:end]).end_of_day
if in_same_day(start_date, end_date)
@training_availabilities = Availability.includes(:tags, :trainings).where.not(available_type: 'machines')
@training_and_event_availabilities = Availability.includes(:tags, :trainings).where.not(available_type: 'machines')
.where('start_at >= ? AND end_at <= ?', start_date, end_date)
@machine_availabilities = Availability.includes(:tags, :machines).where(available_type: 'machines')
.where('start_at >= ? AND end_at <= ?', start_date, end_date)
@ -31,7 +31,7 @@ class API::AvailabilitiesController < API::ApiController
end
end
end
@availabilities = [].concat(@training_availabilities).concat(@machine_slots)
@availabilities = [].concat(@training_and_event_availabilities).concat(@machine_slots)
else
@availabilities = Availability.includes(:tags, :machines, :trainings, :event)
.where('start_at >= ? AND end_at <= ?', start_date, end_date)