Fix line search form request attributes Refs #1937

5 files changed, 11 insertions, 13 deletions

diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index d2ab3f087..494958ddb 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -1,6 +1,6 @@
 = title_tag t('lines.index.title')
 
-= render partial: 'shared/lines_search_form', locals: { referential_type: 'line_referential' }
+= render partial: 'shared/lines_search_form', locals: { referential: @line_referential }
 
 #lines
   = render 'lines'
diff --git a/app/views/referential_lines/index.html.slim b/app/views/referential_lines/index.html.slim
index d6fb00e6b..9facb1a73 100644
--- a/app/views/referential_lines/index.html.slim
+++ b/app/views/referential_lines/index.html.slim
@@ -1,6 +1,6 @@
 = title_tag t('lines.index.title')
 
-= render partial: 'shared/lines_search_form', locals: { referential_type: 'referential' }
+= render partial: 'shared/lines_search_form', locals: { referential: @referential }
 
 #lines
   = render 'lines'
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim
index 8cab8caf4..4c6af7975 100644
--- a/app/views/shared/_lines_search_form.html.slim
+++ b/app/views/shared/_lines_search_form.html.slim
@@ -1,5 +1,4 @@
-- referential = instance_variable_get("@#{referential_type}")
-= search_form_for @q, url: eval("#{referential_type}_lines_path(referential)"), remote: true, html: { method: :get, class: 'form-inline', id: 'search', role: 'form' } do |f|
+= search_form_for @q, url: eval("#{referential.class.name.underscore}_lines_path(referential)"), remote: true, html: { method: :get, class: 'form-inline', id: 'search', role: 'form' } do |f|
   .panel.panel-default
     .panel-heading
       .input-group.col-md-9.col-sm-9
@@ -15,10 +14,9 @@
     #advanced_search.panel-collapse.collapse
       .panel-body
         .row
-          - %w(networks companies group_of_lines transport_modes).each do |filter|
-            - options_container = (referential_type == 'referential' && filter == 'transport_modes') ? referential.line_referential : referential
-            - if options_container && options_container.send(filter).any?
-              - options = options_container.send(filter).collect { |f| [f.name, filter == 'transport_modes' ? f.name : f.id] }.unshift([t("lines.index.no_#{filter}"), -1])
-              - matcher = filter == 'transport_modes' ? :transport_mode_eq : :"#{filter == 'group_of_lines' ? filter : filter.singularize}_id_eq"
-              .col-xs-3
-                = f.select(matcher, options, { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_#{filter}") })
+          .col-xs-3
+            = f.select(:network_id_eq, referential.networks.collect { |n| [n.name, n.id] }.unshift([t("lines.index.no_networks"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_networks") })
+          .col-xs-3
+            = f.select(:company_id_eq, referential.companies.collect { |c| [c.name, c.id] }.unshift([t("lines.index.no_networks"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_companies") })
+          .col-xs-3
+            = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") })            
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
index e09a08696..2f865c9f1 100644
--- a/config/locales/enumerize.en.yml
+++ b/config/locales/enumerize.en.yml
@@ -103,7 +103,7 @@ en:
         waterborne: "Waterborne"
         private_vehicle: "Private vehicle"
         walk: "Walk"
-        trolleybus: "Trolleybus"
+        trolleyBus: "Trolleybus"
         bicycle: "Bicycle"
         shuttle: "Shuttle"
         taxi: "Taxi"
diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml
index 62f5d53f6..33a987359 100644
--- a/config/locales/enumerize.fr.yml
+++ b/config/locales/enumerize.fr.yml
@@ -102,7 +102,7 @@ fr:
         waterborne: Bac
         private_vehicle: Voiture particulière
         walk: Marche à pied
-        trolleybus: Trolleybus
+        trolleyBus: Trolleybus
         bicycle: Vélo
         shuttle: Navette
         taxi: Taxi