summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-20 09:57:24 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-20 09:57:24 +0000
commit08c9a5e3ef1a8abff1c950fb0862363970a95164 (patch)
tree56cb59cd7ff17615d7a111c29fb3cbe4ceabff4b
parentaf89a8b201518176bc737e148494cbf413ddb446 (diff)
downloadredmine-08c9a5e3ef1a8abff1c950fb0862363970a95164.tar.gz
redmine-08c9a5e3ef1a8abff1c950fb0862363970a95164.zip
Remove pagination on trackers, roles and issue statuses (#12909).
git-svn-id: http://svn.redmine.org/redmine/trunk@15273 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issue_statuses_controller.rb10
-rw-r--r--app/controllers/roles_controller.rb4
-rw-r--r--app/controllers/trackers_controller.rb10
-rw-r--r--app/views/issue_statuses/index.html.erb2
-rw-r--r--app/views/roles/index.html.erb2
-rw-r--r--app/views/trackers/index.html.erb2
6 files changed, 8 insertions, 22 deletions
diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index ba463e25d..6d574fe87 100644
--- 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 f3fa8f102..2732a89a1 100644
--- 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 b89a431fb..91784d16e 100644
--- 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 40a5c92ce..59d684691 100644
--- 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 6561d1170..f9855f181 100644
--- 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 8ba7b7cdc..9dd253ecc 100644
--- 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)) -%>