diff options
| author | Alban Peignier | 2018-04-17 21:30:57 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-17 21:30:57 +0200 |
| commit | 495f12f25a00a9a29ab7243ddc69970c670f381e (patch) | |
| tree | 4e5ec894030f9984fc46d9e537804826038ea9d0 | |
| parent | 1da7c1caf8f3bab86cc4c5095d75c1d60e603759 (diff) | |
| parent | c6f4180068e92bf5e1045ab00bf87d3b0908b927 (diff) | |
| download | chouette-core-495f12f25a00a9a29ab7243ddc69970c670f381e.tar.bz2 | |
Merge pull request #491 from af83/6549-fix-tiletables-specs
Fix timetables specs. Fixes #6549
| -rw-r--r-- | app/controllers/time_tables_controller.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb index 2ac8532e0..4ca2293f0 100644 --- a/app/controllers/time_tables_controller.rb +++ b/app/controllers/time_tables_controller.rb @@ -77,7 +77,7 @@ class TimeTablesController < ChouetteController end def index - request.format.kml? ? @per_page = nil : @per_page = 12 + # request.format.kml? ? @per_page = nil : @per_page = 12 index! do |format| format.html { @@ -130,6 +130,7 @@ class TimeTablesController < ChouetteController @time_tables ||= begin time_tables = @q.result(:distinct => true) + sort_column if sort_column == "bounding_dates" time_tables = @q.result(:distinct => false).paginate(page: params[:page], per_page: 10) ids = time_tables.pluck(:id).uniq @@ -186,10 +187,13 @@ class TimeTablesController < ChouetteController private def sort_column - valid_cols = referential.time_tables.column_names - valid_cols << "bounding_dates" - valid_cols << "vehicle_journeys_count" - valid_cols.include?(params[:sort]) ? params[:sort] : 'comment' + @@valid_cols ||= begin + valid_cols = %w(id color comment) + valid_cols << "bounding_dates" + valid_cols << "vehicle_journeys_count" + valid_cols + end + @@valid_cols.include?(params[:sort]) ? params[:sort] : 'comment' end def sort_direction %w[asc desc].include?(params[:direction]) ? params[:direction] : 'asc' |