set objets per page to 12 (param in initializer)

9 files changed, 12 insertions, 10 deletions

diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index d7b86da06..a895c4f61 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -15,7 +15,7 @@ class CompaniesController < ChouetteController
   protected
   def collection    
     @q = referential.companies.search(params[:q])
-    @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page], :per_page => 10)
+    @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
   end
 
 
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index ab5cbf8ef..dc6ba78c9 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -25,7 +25,7 @@ class ConnectionLinksController < ChouetteController
 
   def collection    
     @q = referential.connection_links.search(params[:q])
-    @connection_links ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page], :per_page => 10)
+    @connection_links ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
   end
 
   def resource_url(connection_link = nil)
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 4d6a168b6..6b8855dc1 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -24,7 +24,7 @@ class JourneyPatternsController < ChouetteController
 
   def show
     #@map = RouteMap.new(route).with_helpers(self)
-    @stop_points = resource.stop_points.paginate(:page => params[:page], :per_page => 10)
+    @stop_points = resource.stop_points.paginate(:page => params[:page])
     show!
   end
 
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 57be0f6b3..071c5eab5 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -23,7 +23,7 @@ class LinesController < ChouetteController
 
   def collection
     @q = referential.lines.search(params[:q])
-    @lines ||= @q.result(:distinct => true).order(:number).paginate(:page => params[:page], :per_page => 10).includes([:network, :company])
+    @lines ||= @q.result(:distinct => true).order(:number).paginate(:page => params[:page]).includes([:network, :company])
   end
 
 end
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 6522ad502..8cdd562a4 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -15,7 +15,7 @@ class NetworksController < ChouetteController
 
   def collection    
     @q = referential.networks.search(params[:q])
-    @networks ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page], :per_page => 10)
+    @networks ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
   end
 
   def resource_url(network = nil)
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index 99b9899fa..91da5519c 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -16,7 +16,7 @@ class RoutesController < ChouetteController
 
   def show
     @map = RouteMap.new(route).with_helpers(self)
-    @stop_points = route.stop_points.paginate(:page => params[:page], :per_page => 10)
+    @stop_points = route.stop_points.paginate(:page => params[:page])
     show!
   end
 
@@ -46,7 +46,7 @@ class RoutesController < ChouetteController
     @routes ||= 
       begin
         routes = @q.result(:distinct => true).order(:name)
-        routes = routes.paginate(:page => params[:page], :per_page => @per_page) if @per_page.present?
+        routes = routes.paginate(:page => params[:page]) if @per_page.present?
         routes
       end
   end
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 4f8aec734..b094ab909 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -35,7 +35,7 @@ class StopAreasController < ChouetteController
   end
 
   def index     
-    request.format.kml? ? @per_page = nil : @per_page = 10
+    request.format.kml? ? @per_page = nil : @per_page = WillPaginate.per_page
     index!
   end
 
@@ -77,7 +77,7 @@ class StopAreasController < ChouetteController
     @stop_areas ||= 
       begin
         stop_areas = @q.result(:distinct => true).order(:name)
-        stop_areas = stop_areas.paginate(:page => params[:page], :per_page => @per_page) if @per_page.present?
+        stop_areas = stop_areas.paginate(:page => params[:page]) if @per_page.present?
         stop_areas
       end
   end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index a3e2c85c4..8f57f18c0 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -26,7 +26,7 @@ class TimeTablesController < ChouetteController
 
   def collection    
     @q = referential.time_tables.search(params[:q])
-    @time_tables ||= @q.result(:distinct => true).order(:comment).paginate(:page => params[:page], :per_page => 10)
+    @time_tables ||= @q.result(:distinct => true).order(:comment).paginate(:page => params[:page])
   end
 
   def resource_url(time_table = nil)
diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb
new file mode 100644
index 000000000..534a0802a
--- /dev/null
+++ b/config/initializers/will_paginate.rb
@@ -0,0 +1,2 @@
+# set per_page globally
+WillPaginate.per_page = 12
\ No newline at end of file