Fix tests and merge master

1 files changed, 6 insertions, 0 deletions

diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index aee3f8c67..be4ca6547 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -81,4 +81,10 @@ class LinesController < ChouetteController
     @lines ||= @q.result(:distinct => true).order(:number).paginate(:page => params[:page]).includes([:network, :company])
   end
 
+  private
+
+  def line_params
+    params.require(:line).permit( :transport_mode, :network_id, :company_id, :objectid, :object_version, :creation_time, :creator_id, :name, :number, :published_name, :transport_mode_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs, :flexible_service, :group_of_lines, :group_of_line_ids, :group_of_line_tokens, :url, :color, :text_color)
+  end
+
 end