jro_apps/redmine Commit - r10592:ab69845ea23e

Merged r10801 from trunk (#12349)....

Jean-Philippe Lang -

r10592:ab69845ea23e

parent child

Context file:

r10592:ab69845ea23e

Collapse all files

app/models/principal.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Principal < ActiveRecord::Base
               self.table_name = "#{table_name_prefix}users#{table_name_suffix}"
               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
               has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}", :order => "#{Project.table_name}.name"
               has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               # Groups and active users
               scope :active, :conditions => "#{Principal.table_name}.status = 1"
               scope :like, lambda {|q|
                 if q.blank?
                   {}
                 else
-                  q = q.to_s.downcase
+                  q = q.to_s
                   pattern = "%#{q}%"
-                  sql = "LOWER(login) LIKE :p OR LOWER(firstname) LIKE :p OR LOWER(lastname) LIKE :p OR LOWER(mail) LIKE :p"
+                  sql = "LOWER(login) LIKE LOWER(:p) OR LOWER(firstname) LIKE LOWER(:p) OR LOWER(lastname) LIKE LOWER(:p) OR LOWER(mail) LIKE LOWER(:p)"
                   params = {:p => pattern}
                   if q =~ /^(.+)\s+(.+)$/
                     a, b = "#{$1}%", "#{$2}%"
-                    sql << " OR (LOWER(firstname) LIKE :a AND LOWER(lastname) LIKE :b) OR (LOWER(firstname) LIKE :b AND LOWER(lastname) LIKE :a)"
+                    sql << " OR (LOWER(firstname) LIKE LOWER(:a) AND LOWER(lastname) LIKE LOWER(:b)) OR (LOWER(firstname) LIKE LOWER(:b) AND LOWER(lastname) LIKE LOWER(:a))"
                     params.merge!(:a => a, :b => b)
                   end
                   {:conditions => [sql, params]}
                 end
               }
               # Principals that are members of a collection of projects
               scope :member_of, lambda {|projects|
                 projects = [projects] unless projects.is_a?(Array)
                 if projects.empty?
                   {:conditions => "1=0"}
                 else
                   ids = projects.map(&:id)
                   {:conditions => ["#{Principal.table_name}.status = 1 AND #{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids]}
                 end
               }
               # Principals that are not members of projects
               scope :not_member_of, lambda {|projects|
                 projects = [projects] unless projects.is_a?(Array)
                 if projects.empty?
                   {:conditions => "1=0"}
                 else
                   ids = projects.map(&:id)
                   {:conditions => ["#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids]}
                 end
               }
               before_create :set_default_empty_values
               def name(formatter = nil)
                 to_s
               end
               def <=>(principal)
                 if principal.nil?
                   -1
                 elsif self.class.name == principal.class.name
                   self.to_s.downcase <=> principal.to_s.downcase
                 else
                   # groups after users
                   principal.class.name <=> self.class.name
                 end
               end
               protected
               # Make sure we don't try to insert NULL values (see #4632)
               def set_default_empty_values
                 self.login ||= ''
                 self.hashed_password ||= ''
                 self.firstname ||= ''
                 self.lastname ||= ''
                 self.mail ||= ''
                 true
               end
             end

test/unit/principal_test.rb +9 0

+            # encoding: utf-8
+            #
             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class PrincipalTest < ActiveSupport::TestCase
               fixtures :users, :projects, :members, :member_roles
               def test_active_scope_should_return_groups_and_active_users
                 result = Principal.active.all
                 assert_include Group.first, result
                 assert_not_nil result.detect {|p| p.is_a?(User)}
                 assert_nil result.detect {|p| p.is_a?(User) && !p.active?}
                 assert_nil result.detect {|p| p.is_a?(AnonymousUser)}
               end
               def test_member_of_scope_should_return_the_union_of_all_members
                 projects = Project.find_all_by_id(1, 2)
                 assert_equal projects.map(&:principals).flatten.sort, Principal.member_of(projects).sort
               end
               def test_member_of_scope_should_be_empty_for_no_projects
                 assert_equal [], Principal.member_of([]).sort
               end
               def test_not_member_of_scope_should_return_users_that_have_no_memberships
                 projects = Project.find_all_by_id(1, 2)
                 expected = (Principal.all - projects.map(&:memberships).flatten.map(&:principal)).sort
                 assert_equal expected, Principal.not_member_of(projects).sort
               end
               def test_not_member_of_scope_should_be_empty_for_no_projects
                 assert_equal [], Principal.not_member_of([]).sort
               end
               context "#like" do
                 setup do
                   Principal.create!(:login => 'login')
                   Principal.create!(:login => 'login2')
                   Principal.create!(:firstname => 'firstname')
                   Principal.create!(:firstname => 'firstname2')
                   Principal.create!(:lastname => 'lastname')
                   Principal.create!(:lastname => 'lastname2')
                   Principal.create!(:mail => 'mail@example.com')
                   Principal.create!(:mail => 'mail2@example.com')
                   @palmer = Principal.create!(:firstname => 'David', :lastname => 'Palmer')
                 end
                 should "search login" do
                   results = Principal.like('login')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.login.match(/login/) }
                 end
                 should "search firstname" do
                   results = Principal.like('firstname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.firstname.match(/firstname/) }
                 end
                 should "search lastname" do
                   results = Principal.like('lastname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.lastname.match(/lastname/) }
                 end
                 should "search mail" do
                   results = Principal.like('mail')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.mail.match(/mail/) }
                 end
                 should "search firstname and lastname" do
                   results = Principal.like('david palm')
                   assert_equal 1, results.count
                   assert_equal @palmer, results.first
                 end
                 should "search lastname and firstname" do
                   results = Principal.like('palmer davi')
                   assert_equal 1, results.count
                   assert_equal @palmer, results.first
                 end
               end
+              def test_like_scope_with_cyrillic_name
+                user = User.generate!(:firstname => 'Соболев', :lastname => 'Денис')
+                results = Principal.like('Собо')
+                assert_equal 1, results.count
+                assert_equal user, results.first
+              end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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