Fix filters use with will paginate in stop_areas and lines

3 files changed, 24 insertions, 5 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 889062c6c..86c80f249 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
     warden (1.2.1)
       rack (>= 1.0)
     websocket (1.0.7)
-    will_paginate (3.0.3)
+    will_paginate (3.0.5)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index acae8348e..effb0deba 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -7,6 +7,17 @@ class LinesController < ChouetteController
 
   belongs_to :referential
 
+  def index    
+    index! do |format|
+      format.html {
+        if collection.out_of_bounds?
+          redirect_to params.merge(:page => 1)
+        end
+      }
+    end       
+  end
+
+  
   def show
     @map = LineMap.new(resource).with_helpers(self)
     @routes = @line.routes
@@ -17,7 +28,7 @@ class LinesController < ChouetteController
   # overwrite inherited resources to use delete instead of destroy 
   # foreign keys will propagate deletion)
   def destroy_resource(object)
-        object.delete
+    object.delete
   end
       
   def destroy_all
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index a3e2ab921..d54d888e4 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 class StopAreasController < ChouetteController
   defaults :resource_class => Chouette::StopArea
 
   belongs_to :referential do
     belongs_to :line, :parent_class => Chouette::Line, :optional => true, :polymorphic => true
     belongs_to :network, :parent_class => Chouette::Network, :optional => true, :polymorphic => true
-    belongs_to :connection_link, :parent_class => Chouette::Network, :optional => true, :polymorphic => true
+    belongs_to :connection_link, :parent_class => Chouette::ConnectionLink, :optional => true, :polymorphic => true
   end
 
   respond_to :html, :kml, :xml, :json
@@ -40,9 +41,16 @@ class StopAreasController < ChouetteController
     @detail_access_links = stop_area.detail_access_link_matrix
   end
 
-  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