aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/lines_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2016-11-18 18:22:54 +0100
committerLuc Donnet2016-11-18 18:22:54 +0100
commit129d7bfe13a2b7e92ec696ef91bfa9211a6ff07e (patch)
treeb079c2e55c6ad1b0a53f3f781dd63360f65d34ee /app/controllers/lines_controller.rb
parentd4f49e51d138050a6c27fef2573649e607d56381 (diff)
parenta6f8318aa267e3723eb4c10647447ff08cd5fdca (diff)
downloadchouette-core-129d7bfe13a2b7e92ec696ef91bfa9211a6ff07e.tar.bz2
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app/controllers/lines_controller.rb')
-rw-r--r--app/controllers/lines_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 1a5c30787..eb38352be 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -73,7 +73,7 @@ class LinesController < BreadcrumbController
end
def collection
- %w(network_id company_id group_of_lines_id comment_id transport_mode_name).each do |filter|
+ %w(network_id company_id group_of_lines_id comment_id transport_mode).each do |filter|
if params[:q] && params[:q]["#{filter}_eq"] == '-1'
params[:q]["#{filter}_eq"] = ''
params[:q]["#{filter}_blank"] = '1'
@@ -91,7 +91,7 @@ class LinesController < BreadcrumbController
end
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, :stable_id, { footnotes_attributes: [ :code, :label, :_destroy, :id ] } )
+ params.require(:line).permit( :transport_mode, :network_id, :company_id, :objectid, :object_version, :creation_time, :creator_id, :name, :number, :published_name, :transport_mode, :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, :stable_id, { footnotes_attributes: [ :code, :label, :_destroy, :id ] } )
end
end