aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2017-03-23 14:48:36 +0100
committerjpl2017-03-23 14:48:45 +0100
commitc8ad494d5b139e6b50881e17896c46bcf27b50eb (patch)
treebb608ec2df45ae8afcfcc86a3017a709ba20a05a
parent5d1ed5b589b2175b805e5cb0217382ebfc8a6b36 (diff)
downloadchouette-core-c8ad494d5b139e6b50881e17896c46bcf27b50eb.tar.bz2
Refs #2919: fix ordering on networks.name
-rw-r--r--app/controllers/lines_controller.rb2
-rw-r--r--app/views/lines/index.html.slim2
2 files changed, 2 insertions, 2 deletions
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'
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index 389adf755..464ddc25c 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -24,7 +24,7 @@
{ 'Oid' => Proc.new { |n| n.objectid.local_id },
:number => 'number',
:name => 'name',
- :network => Proc.new { |n| n.try(:network).try(:name) },
+ 'networks.name' => Proc.new { |n| n.try(:network).try(:name) },
'companies.name' => Proc.new { |n| n.try(:company).try(:name) },
:transport_mode => Proc.new { |n| n.transport_mode.nil? ? '-' : t("enumerize.line.transport_mode.#{n.try(:transport_mode)}") },
:transport_submode => Proc.new { |n| n.transport_submode.nil? ? '-' : t("enumerize.line.transport_submode.#{n.try(:transport_submode)}") } },