Fix tests and merge master

1 files changed, 3 insertions, 1 deletions

diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index c74b0ade8..9f9d66ba5 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -75,7 +75,9 @@ class RoutesController < ChouetteController
       end
   end
 
-  def permitted_params
+  private
+  
+  def route_params
     params.require(:route).permit( :direction_code, :wayback_code, :line_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :opposite_route_id, :published_name, :number, :direction, :wayback, { stop_points_attributes: [ :id, :_destroy, :position, :stop_area_id ] } )
   end