Fix filters use with will paginate when active filter return less pages than current, Mantis 20954

1 files changed, 9 insertions, 2 deletions

diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index d26595a85..6203cefab 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -8,9 +8,16 @@ class AccessPointsController < ChouetteController
   respond_to :html, :kml, :xml, :json
 
 
-  def index
+  def index    
     request.format.kml? ? @per_page = nil : @per_page = 12
-    index!
+
+    index! do |format|
+      format.html {
+        if collection.out_of_bounds?
+          redirect_to params.merge(:page => 1)
+        end
+      }
+    end       
   end
 
   def show