aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/line_referential.rb2
-rw-r--r--app/views/shared/_lines_search_form.html.slim2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index add9ae5b6..47bd67a06 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -28,6 +28,6 @@ class LineReferential < ActiveRecord::Base
end
def transport_modes
- Chouette::TransportMode.all.select { |tm| tm.to_i.positive? }
+ Chouette::TransportMode.all.select { |tm| tm.to_i > 0 }
end
end
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim
index 065b365b2..30cdb1483 100644
--- a/app/views/shared/_lines_search_form.html.slim
+++ b/app/views/shared/_lines_search_form.html.slim
@@ -17,7 +17,7 @@
.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&.send(filter).any?
+ - 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_name_eq : :"#{filter == 'group_of_lines' ? filter : filter.singularize}_id_eq"
.col-xs-3