jro_apps/redmine Commit - r2120:72d0843c1fef

Makes User.find_by_mail case-insensitive (password reminder #2322, repo users mapping)....

Jean-Philippe Lang -

r2120:72d0843c1fef

parent child

Context file:

r2120:72d0843c1fef

app/models/user.rb +5 0

                 token = Token.find_by_action_and_value('autologin', key)
                 token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
               end
+              # Makes find_by_mail case-insensitive
+              def self.find_by_mail(mail)
+                find(:first, :conditions => ["LOWER(mail) = ?", mail.to_s.downcase])
+              end
               # Sort users by their display names
               def <=>(user)

test/integration/account_test.rb +1 -1

                 assert_response :success
                 assert_template "account/lost_password"
-                post "account/lost_password", :mail => 'jsmith@somenet.foo'
+                post "account/lost_password", :mail => 'jSmith@somenet.foo'
                 assert_redirected_to "account/login"
                 token = Token.find(:first)

test/unit/user_test.rb +6 0

@@ -158,4 +158,10 class UserTest < Test::Unit::TestCase
158	@jsmith.pref.comments_sorting = 'desc'	158	@jsmith.pref.comments_sorting = 'desc'
159	assert @jsmith.wants_comments_in_reverse_order?	159	assert @jsmith.wants_comments_in_reverse_order?
160	end	160	end
		161
		162	def test_find_by_mail_should_be_case_insensitive
		163	u = User.find_by_mail('JSmith@somenet.foo')
		164	assert_not_nil u
		165	assert_equal 'jsmith@somenet.foo', u.mail
		166	end
161	end	167	end

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