Remove pagination on trackers, roles and issue statuses (#12909).

git-svn-id: http://svn.redmine.org/redmine/trunk@15273 e93f8b46-1217-0410-a6f0-8f06a7374b81

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

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index f3fa8f1027aba07c953c440e7f7b6b57426938cd..2732a89a11a643845c5aed74816b771c057faddf 100644 (file)
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -28,8 +28,8 @@ class RolesController < ApplicationController
   def index
     respond_to do |format|
       format.html {
-        @role_pages, @roles = paginate Role.sorted, :per_page => 25
-        render :action => "index", :layout => false if request.xhr?
+        @roles = Role.sorted.to_a
+        render :layout => false if request.xhr?
       }
       format.api {
         @roles = Role.givable.to_a

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index b89a431fb1860ddc60de5fc677c6f5ab679a4513..91784d16efb243806cb1d0541fe8905fe377e819 100644 (file)
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -23,14 +23,10 @@ class TrackersController < ApplicationController
   accept_api_auth :index
 
   def index
+    @trackers = Tracker.sorted.to_a
     respond_to do |format|
-      format.html {
-        @tracker_pages, @trackers = paginate Tracker.sorted, :per_page => 25
-        render :action => "index", :layout => false if request.xhr?
-      }
-      format.api {
-        @trackers = Tracker.sorted.to_a
-      }
+      format.html { render :layout => false if request.xhr? }
+      format.api
     end
   end
 

diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index 40a5c92ce1be9dbc6c36203533fb887cea657a59..59d6846914b611dadaf3f9cac020033c9b40ae79 100644 (file)
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -32,6 +32,4 @@
   </tbody>
 </table>
 
-<span class="pagination"><%= pagination_links_full @issue_status_pages %></span>
-
 <% html_title(l(:label_issue_status_plural)) -%>

diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index 6561d11704878792e692e49326e20d664762c987..f9855f181467722b4320aae50c7e7c16063838fe 100644 (file)
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -29,6 +29,4 @@
   </tbody>
 </table>
 
-<span class="pagination"><%= pagination_links_full @role_pages %></span>
-
 <% html_title(l(:label_role_plural)) -%>

diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb
index 8ba7b7cdcffe87c26c52495a9f9dabe8916079b4..9dd253eccfe916f71ebf96a8145fe40c0ce2bf2c 100644 (file)
--- a/app/views/trackers/index.html.erb
+++ b/app/views/trackers/index.html.erb
@@ -34,6 +34,4 @@
   </tbody>
 </table>
 
-<span class="pagination"><%= pagination_links_full @tracker_pages %></span>
-
 <% html_title(l(:label_tracker_plural)) -%>