Use #per_page instead of #items_per_page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11425 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 2ecbc63eba11ad1f23f06d1108751764af7975fb..47f5c0f07eb6b3b9133ded5197afa2c8d5f2fc11 100644 (file)
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -46,7 +46,7 @@ class BoardsController < ApplicationController
         @topics =  @board.topics.
           reorder("#{Message.table_name}.sticky DESC").
           includes(:last_reply).
-          limit(@topic_pages.items_per_page).
+          limit(@topic_pages.per_page).
           offset(@topic_pages.offset).
           order(sort_clause).
           preload(:author, {:last_reply => :author}).

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f2e69697aaa89d005ada8f9733709aa7a35e8522..b29b64e342ee58c1864d9645e709899f45bf1e9b 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -44,7 +44,7 @@ class MessagesController < ApplicationController
     @replies =  @topic.children.
       includes(:author, :attachments, {:board => :project}).
       reorder("#{Message.table_name}.created_on ASC").
-      limit(@reply_pages.items_per_page).
+      limit(@reply_pages.per_page).
       offset(@reply_pages.offset).
       all
 

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 91f196050dd10bd01ece61152c3fa1b20cab938c..a757df1549f1cdf0383b8a6091477b03979f11d7 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -142,7 +142,7 @@ class RepositoriesController < ApplicationController
                                      per_page_option,
                                      params['page']
     @changesets = @repository.changesets.
-      limit(@changeset_pages.items_per_page).
+      limit(@changeset_pages.per_page).
       offset(@changeset_pages.offset).
       includes(:user, :repository, :parents).
       all

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index b24888f4b10a7fe09152e18dddece07f81063d3f..a6f160fa0f41247ee5b25ad7e008368e58f50104 100644 (file)
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -55,7 +55,7 @@ class TimelogController < ApplicationController
         @entries = scope.all(
           :include => [:project, :activity, :user, {:issue => :tracker}],
           :order => sort_clause,
-          :limit  =>  @entry_pages.items_per_page,
+          :limit  =>  @entry_pages.per_page,
           :offset =>  @entry_pages.offset
         )
         @total_hours = scope.sum(:hours).to_f

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 28d3d57f892aa257b0a0599e1e338f3f135679aa..a1d68edc5f347bb20b179560c049ad1e65851edf 100644 (file)
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -217,7 +217,7 @@ class WikiController < ApplicationController
     @versions = @page.content.versions.
       select("id, author_id, comments, updated_on, version").
       reorder('version DESC').
-      limit(@version_pages.items_per_page + 1).
+      limit(@version_pages.per_page + 1).
       offset(@version_pages.offset).
       all