Merge Timeband feature and revert Gemfile

2 files changed, 21 insertions, 1 deletions

diff --git a/app/controllers/timebands_controller.rb b/app/controllers/timebands_controller.rb
new file mode 100644
index 000000000..446255cac
--- /dev/null
+++ b/app/controllers/timebands_controller.rb
@@ -0,0 +1,20 @@
+class TimebandsController < ChouetteController
+
+  defaults :resource_class => Chouette::Timeband
+
+  respond_to :html
+
+  belongs_to :referential
+
+  def new
+    new! do
+      build_breadcrumb :new
+    end
+  end
+
+  private
+
+  def timeband_params
+    params.require(:timeband).permit( :name, :start_time, :end_time )
+  end
+end
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index bac4166a5..2c2a533aa 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -97,7 +97,7 @@ class VehicleJourneysController < ChouetteController
                                                                                                       :stop_point_id,
                                                                                                       :departure_time,
                                                                                                       :is_frequency] },
-                                             { frequencies_attributes: [ :scheduled_headway_interval, :first_departure_time,
+                                             { journey_frequencies_attributes: [ :scheduled_headway_interval, :first_departure_time,
                                                                          :last_departure_time,
                                                                          :exact_time ] } )
   end