Fix create time_table with calendar association

Refs #2347

2 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index dcf8f3e5e..5c4552afb 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -43,7 +43,7 @@ class TimeTablesController < ChouetteController
 
     if calendar
       calendar.dates.each_with_index do |date, i|
-        @time_table.dates << Chouette::TimeTableDate.new(date: date, position: i)
+        @time_table.dates << Chouette::TimeTableDate.new(date: date, position: i, in_out: true)
       end
       calendar.date_ranges.each_with_index do |date_range, i|
         @time_table.periods << Chouette::TimeTablePeriod.new(period_start: date_range.begin, period_end: date_range.end, position: i)
diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim
index 196682823..d4e1d838e 100644
--- a/app/views/time_tables/_form.html.slim
+++ b/app/views/time_tables/_form.html.slim
@@ -5,7 +5,7 @@
       = form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")}
 
       - if @time_table.new_record? && !@time_table.created_from
-        = form.input :calendar, as: :select, collection: current_organisation.calendars
+        = form.input :calendar_id, as: :select, collection: current_organisation.calendars
 
       - if @time_table.created_from
         = form.input :created_from, disabled: true, input_html: { value: @time_table.created_from.comment }