Use scoped models for pagination.

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

diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index ddaf9304d2883039b893865073aae06171d119b8..b24befd5b12e954d79da001e8f2481812cd9e9be 100644 (file)
--- a/app/controllers/issue_statuses_controller.rb
+++ b/app/controllers/issue_statuses_controller.rb
@@ -25,7 +25,7 @@ class IssueStatusesController < ApplicationController
   def index
     respond_to do |format|
       format.html {
-        @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
+        @issue_status_pages, @issue_statuses = paginate IssueStatus.sorted, :per_page => 25
         render :action => "index", :layout => false if request.xhr?
       }
       format.api {

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 292304260ed77b3986c30340a7d66d127225c81e..b8a046a99d4b87f5398401e5ad23dcd5917aec0f 100644 (file)
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -26,7 +26,7 @@ class RolesController < ApplicationController
   def index
     respond_to do |format|
       format.html {
-        @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
+        @role_pages, @roles = paginate Role.sorted, :per_page => 25
         render :action => "index", :layout => false if request.xhr?
       }
       format.api {

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 602ea528846a8d4b0168ee22ee7490e7da9a3d57..2811929fab836a722b45e6e96a49c419954822b5 100644 (file)
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -25,7 +25,7 @@ class TrackersController < ApplicationController
   def index
     respond_to do |format|
       format.html {
-        @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
+        @tracker_pages, @trackers = paginate Tracker.sorted, :per_page => 10
         render :action => "index", :layout => false if request.xhr?
       }
       format.api {