From 09cf878a07c894514407b978040e6dc198226f96 Mon Sep 17 00:00:00 2001
From: jpl
Date: Thu, 23 Mar 2017 12:12:16 +0100
Subject: Refs #2919: fix ordering on companies.name

---
 app/controllers/lines_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index cce01e334..1f5478eff 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -92,7 +92,7 @@ class LinesController < BreadcrumbController
   private
 
   def sort_column
-    line_referential.lines.column_names.include?(params[:sort]) ? params[:sort] : 'number'
+    (Chouette::Line.column_names + ['companies.name']).include?(params[:sort]) ? params[:sort] : 'number'
   end
   def sort_direction
     %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
-- 
cgit v1.2.3


From c8ad494d5b139e6b50881e17896c46bcf27b50eb Mon Sep 17 00:00:00 2001
From: jpl
Date: Thu, 23 Mar 2017 14:48:36 +0100
Subject: Refs #2919: fix ordering on networks.name

---
 app/controllers/lines_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 1f5478eff..7eedaeb05 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -92,7 +92,7 @@ class LinesController < BreadcrumbController
   private
 
   def sort_column
-    (Chouette::Line.column_names + ['companies.name']).include?(params[:sort]) ? params[:sort] : 'number'
+    (Chouette::Line.column_names + ['companies.name', 'networks.name']).include?(params[:sort]) ? params[:sort] : 'number'
   end
   def sort_direction
     %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
-- 
cgit v1.2.3