jro_apps/redmine Commit - r11029:e53a5de918c1

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

Jean-Philippe Lang -

r11029:e53a5de918c1

parent child

Context file:

r11029:e53a5de918c1

app/controllers/watchers_controller.rb +1 -1

               end
               def autocomplete_for_user
-                @users = User.active.like(params[:q]).limit(100).all
+                @users = User.active.sorted.like(params[:q]).limit(100).all
                 if @watched
                   @users -= @watched.watcher_users
                 end

app/helpers/application_helper.rb +1 -1

               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

app/helpers/groups_helper.rb +1 -1

               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

app/helpers/members_helper.rb +1 -1

             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

app/models/principal.rb +10 0

                   where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
                 end
               }
+              scope :sorted, lambda { order(*Principal.fields_for_order_statement)}
               before_create :set_default_empty_values
                 end
               end
+              # Returns an array of fields names than can be used to make an order statement for principals.
+              # Users are sorted before Groups.
+              # Examples:
+              def self.fields_for_order_statement(table=nil)
+                table ||= table_name
+                columns = ['type DESC'] + (User.name_formatter[:order] - ['id']) + ['lastname', 'id']
+                columns.uniq.map {|field| "#{table}.#{field}"}
+              end
               protected
               # Make sure we don't try to insert NULL values (see #4632)

app/models/user.rb +1 0

                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
+              scope :sorted, lambda { order(*User.fields_for_order_statement)}
               def set_mail_notification
                 self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?

test/unit/principal_test.rb +14 0

@@ -49,6 +49,20 class PrincipalTest < ActiveSupport::TestCase
49	assert_equal [], Principal.not_member_of([]).sort	49	assert_equal [], Principal.not_member_of([]).sort
50	end	50	end
51		51
		52	def test_sorted_scope_should_sort_users_before_groups
		53	scope = Principal.where("type <> ?", 'AnonymousUser')
		54	expected_order = scope.all.sort do \|a, b\|
		55	if a.is_a?(User) && b.is_a?(Group)
		56	-1
		57	elsif a.is_a?(Group) && b.is_a?(User)
		58	1
		59	else
		60	a.name.downcase <=> b.name.downcase
		61	end
		62	end
		63	assert_equal expected_order.map(&:name).map(&:downcase), scope.sorted.all.map(&:name).map(&:downcase)
		64	end
		65
52	context "#like" do	66	context "#like" do
53	setup do	67	setup do
54	Principal.create!(:login => 'login')	68	Principal.create!(:login => 'login')

test/unit/user_test.rb +4 0

                 @dlopper = User.find(3)
               end
+              def test_sorted_scope_should_sort_user_by_display_name
+                assert_equal User.all.map(&:name).map(&:downcase).sort, User.sorted.all.map(&:name).map(&:downcase)
+              end
               def test_generate
                 User.generate!(:firstname => 'Testing connection')
                 User.generate!(:firstname => 'Testing connection')

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages