diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-23 17:44:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-23 17:44:28 +0000 |
| commit | e53a5de918c1db1f409df8d72a0cb5f38b4c7671 (patch) | |
| tree | bea491687e40e92fa1713da2ba363cece392a24e /app/helpers | |
| parent | c7df78f3b6aee78403e8563b504e10770270fb24 (diff) | |
| download | redmine-e53a5de918c1db1f409df8d72a0cb5f38b4c7671.tar.gz redmine-e53a5de918c1db1f409df8d72a0cb5f38b4c7671.zip | |
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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/members_helper.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 90c0072a9..08141a25c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 5e6b1f7aa..aa58eb575 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -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 diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index eb06a3977..afb90f3df 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -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 |