aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/time_tables_controller.rb
diff options
context:
space:
mode:
authorMichel Etienne2014-05-02 09:41:36 +0200
committerMichel Etienne2014-05-02 09:41:36 +0200
commit62e398c96e60ecb1a424a7fbbde4022220441f69 (patch)
treef3835ba8ba42ffe779a37d55cc9e952094f45229 /app/controllers/time_tables_controller.rb
parent31455ed1e2dfe68bbba0173821a8c47ad39eccaf (diff)
downloadchouette-core-62e398c96e60ecb1a424a7fbbde4022220441f69.tar.bz2
Fix filters use with will paginate when active filter return less pages than current, Mantis 20954
Diffstat (limited to 'app/controllers/time_tables_controller.rb')
-rw-r--r--app/controllers/time_tables_controller.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index a9f799e9d..00109aa76 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -18,6 +18,19 @@ class TimeTablesController < ChouetteController
end
+ def index
+ request.format.kml? ? @per_page = nil : @per_page = 12
+
+ index! do |format|
+ format.html {
+ if collection.out_of_bounds?
+ redirect_to params.merge(:page => 1)
+ end
+ }
+ end
+ end
+
+
protected
def filtered_time_tables_maps