diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-17 11:35:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-17 11:35:42 +0000 |
| commit | d8e4a8fb320625474e20901b4070763bd697807a (patch) | |
| tree | 8012a67044ef6f463a4e07b256acc956ff226d36 /app/controllers | |
| parent | c17ec1643c005036870b45c7b496bbbb3a9784be (diff) | |
| download | redmine-d8e4a8fb320625474e20901b4070763bd697807a.tar.gz redmine-d8e4a8fb320625474e20901b4070763bd697807a.zip | |
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
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/boards_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/messages_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/repositories_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/timelog_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/wiki_controller.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 2ecbc63eb..47f5c0f07 100644 --- 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 f2e69697a..b29b64e34 100644 --- 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 91f196050..a757df154 100644 --- 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 b24888f4b..a6f160fa0 100644 --- 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 28d3d57f8..a1d68edc5 100644 --- 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 |