From 78ba8bca32a79edb3928fb5c30f2cf2247aede69 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 16 Mar 2017 15:34:07 +0100
Subject: Wip sort issue on table list

Refs #2858
---
 app/controllers/referentials_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/controllers/referentials_controller.rb')

diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 5ff296659..9a9e9b151 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -81,7 +81,7 @@ class ReferentialsController < BreadcrumbController
   end
 
   def lines_collection
-    @q = resource.lines.search(params[:q])
+    @q = resource.lines.includes(:company, :network).search(params[:q])
 
     if sort_column && sort_direction
       @reflines ||=
@@ -115,8 +115,10 @@ class ReferentialsController < BreadcrumbController
 
   private
   def sort_column
-    resource.lines.include?(params[:sort]) ? params[:sort] : 'name'
+    sortable_columns = Chouette::Line.column_names + ['networks.name', 'companies.name']
+    params[:sort] if sortable_columns.include?(params[:sort])
   end
+
   def sort_direction
     %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
   end
-- 
cgit v1.2.3