From 9c0013324b3dddb00c70b663a031b4ecf10e92c7 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 19 Apr 2018 17:34:37 +0200
Subject: ReferentialVehicleJourneys: Use display name in line filter drop-down

Previously we had been showing the `name` field for the initial value of
an already selected line. However, that doesn't show all the information
that's normally given in the drop-down options. We instead have to use
the `#display_name` method to get the full display that people are used
to seeing in the drop-down.

This also means we can no longer `pluck`, as more fields are required to
assemble the display name. Instead, just do a simple `find` for the
record.

Refs #5889
---
 app/controllers/referential_vehicle_journeys_controller.rb | 4 +---
 app/views/referential_vehicle_journeys/_filters.html.slim  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb
index c35a06087..14f7909b9 100644
--- a/app/controllers/referential_vehicle_journeys_controller.rb
+++ b/app/controllers/referential_vehicle_journeys_controller.rb
@@ -14,9 +14,7 @@ class ReferentialVehicleJourneysController < ChouetteController
 
   def index
     if params[:q] && params[:q][:route_line_id_eq].present?
-      @filtered_line = Chouette::Line
-        .select(:id, :name)
-        .find(params[:q][:route_line_id_eq])
+      @filtered_line = Chouette::Line.find(params[:q][:route_line_id_eq])
     end
 
     index!
diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim
index 49e6317f7..a6e289b97 100644
--- a/app/views/referential_vehicle_journeys/_filters.html.slim
+++ b/app/views/referential_vehicle_journeys/_filters.html.slim
@@ -33,7 +33,7 @@
                 'select2ed-allow-clear': true, \
                 initvalue: { \
                   id: @filtered_line&.id,
-                  text: @filtered_line&.name \
+                  text: @filtered_line&.display_name \
                 } \
               } \
             },
-- 
cgit v1.2.3