diff options
| author | Xinhui | 2017-03-24 17:16:57 +0100 |
|---|---|---|
| committer | Xinhui | 2017-03-24 17:16:57 +0100 |
| commit | 6580da810148d4ff90f69a7581d07c6bd41c1809 (patch) | |
| tree | 03e5d0b82bfacef479fef71d55fcd2beabc1da80 /app/controllers/lines_controller.rb | |
| parent | 8611cc5a73ec5033bd177e7999cf28174290b6ed (diff) | |
| parent | 2c21e6dbbd2ed85070ee1ebdd26ee97882f424dd (diff) | |
| download | chouette-core-6580da810148d4ff90f69a7581d07c6bd41c1809.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'app/controllers/lines_controller.rb')
| -rw-r--r-- | app/controllers/lines_controller.rb | 2 |
1 files changed, 1 insertions, 1 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' |