aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Perles2015-11-09 15:31:49 +0100
committerBruno Perles2015-11-10 15:39:21 +0100
commiteb1fb75584a78d392e29cc5f7e98f5f6fefe4165 (patch)
tree3ffbd12e5a4bdce36f2116f0a17097a8b49a8658
parent1ce5304d936d16ea7f1797bc0254fb42b925e6d5 (diff)
downloadchouette-core-eb1fb75584a78d392e29cc5f7e98f5f6fefe4165.tar.bz2
#40444 - Search lines on multiple fields
-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 514c82401..50d8dcee3 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -52,12 +52,12 @@ class LinesController < ChouetteController
def filtered_lines_maps
filtered_lines.collect do |line|
- { :id => line.id, :name => line.published_name }
+ { :id => line.id, :name => (line.published_name ? line.published_name : line.name) }
end
end
def filtered_lines
- referential.lines.select{ |t| t.published_name =~ /#{params[:q]}/i }
+ referential.lines.select{ |t| [t.name, t.published_name].find { |e| /#{params[:q]}/i =~ e } }
end
def collection