aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/shared
diff options
context:
space:
mode:
authorvlatka pavisic2016-11-17 14:30:40 +0100
committervlatka pavisic2016-11-17 14:32:21 +0100
commit7a9fb7304e9cd956988d5e624ed26fed1d77ca09 (patch)
tree3b952a7b712f41f9677e34a3ce3113842a26d400 /app/views/shared
parentc68bb71ce5f3741788c65bb92904cf999c2fa654 (diff)
downloadchouette-core-7a9fb7304e9cd956988d5e624ed26fed1d77ca09.tar.bz2
Refs #1937 : Lines filtering by transport mode
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_lines_search_form.html.slim13
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim
index ba25370a8..065b365b2 100644
--- a/app/views/shared/_lines_search_form.html.slim
+++ b/app/views/shared/_lines_search_form.html.slim
@@ -2,7 +2,7 @@
= 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|
.panel.panel-default
.panel-heading
- .input-group.col-lg-9.col-md-9
+ .input-group.col-md-9
= f.search_field :name_or_number_or_objectid_or_comment_cont, placeholder: t('lines.index.name_or_number_or_objectid_or_comment'), class: 'form-control'
.input-group-btn
button.btn.btn-primary type='submit'
@@ -15,7 +15,10 @@
#advanced_search.panel-collapse.collapse
.panel-body
.row
- - %w(networks companies group_of_lines).each do |filter|
- - if referential.send(filter).any?
- .col-lg-4.col-md-4.col-sm-4.col-xs-4
- = f.select(:"#{filter.singularize unless filter == 'group_of_lines'}_id_eq", referential.send(filter).collect { |f| [f.name, f.id] }.unshift([t("lines.index.no_#{filter}"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_#{filter}") })
+ - %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&.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_name_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}") })