Fix tests and merge master

1 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 907d1e63d..6f33fd0de 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -50,8 +50,8 @@ class JourneyPatternsController < ChouetteController
     @journey_patterns ||= @q.result(:distinct => true).order(:name)
   end
 
-  def permitted_params
-    params.permit(journey_pattern: [ :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points ])
+  def journey_pattern_params
+    params.require(journey_pattern).permit( :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points )
   end
 
 end