Adds "sorted" scope to Principal and User and sort users/groups properly.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11259 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-01-23 17:44:28 +00:00
parent c7df78f3b6
commit e53a5de918
8 changed files with 33 additions and 4 deletions
+1 -1
View File
@@ -316,7 +316,7 @@ module ApplicationHelper
def principals_check_box_tags(name, principals)
s = ''
principals.sort.each do |principal|
principals.each do |principal|
s << "<label>#{ check_box_tag name, principal.id, false } #{h principal}</label>\n"
end
s.html_safe
+1 -1
View File
@@ -26,7 +26,7 @@ module GroupsHelper
end
def render_principals_for_new_group_users(group)
scope = User.active.not_in_group(group).like(params[:q])
scope = User.active.sorted.not_in_group(group).like(params[:q])
principal_count = scope.count
principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+1 -1
View File
@@ -19,7 +19,7 @@
module MembersHelper
def render_principals_for_new_members(project)
scope = Principal.active.not_member_of(project).like(params[:q]).order('type, login, lastname ASC')
scope = Principal.active.sorted.not_member_of(project).like(params[:q])
principal_count = scope.count
principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all