aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorZog2018-02-02 13:08:51 +0100
committercedricnjanga2018-02-06 11:11:33 -0800
commit3404e2967e9b0aca7bac43eeb4f11d4280248e24 (patch)
tree93aaf121a3ed90b4d1f4e69fb0b85957b83c0a28 /app/controllers
parent401754ecbe63e65736697c14123c6a21b2d34157 (diff)
downloadchouette-core-3404e2967e9b0aca7bac43eeb4f11d4280248e24.tar.bz2
Refs #5835; Timetables inherit application days from calendars
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/time_tables_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 0707b9648..0dcadad1e 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -36,7 +36,6 @@ class TimeTablesController < ChouetteController
def create
tt_params = time_table_params
if tt_params[:calendar_id] && tt_params[:calendar_id] != ""
- %i(monday tuesday wednesday thursday friday saturday sunday).map { |d| tt_params[d] = true }
calendar = Calendar.find(tt_params[:calendar_id])
tt_params[:calendar_id] = nil if tt_params.has_key?(:dates_attributes) || tt_params.has_key?(:periods_attributes)
end
@@ -45,6 +44,7 @@ class TimeTablesController < ChouetteController
@time_table = created_from ? created_from.duplicate : Chouette::TimeTable.new(tt_params)
if calendar
+ @time_table.int_day_types = calendar.int_day_types
calendar.dates.each_with_index do |date, i|
@time_table.dates << Chouette::TimeTableDate.new(date: date, position: i, in_out: true)
end