Prevent 'has already been taken' error messages for user login and email if…

Prevent 'has already been taken' error messages for user login and email if these fields are left empty. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1042 e93f8b46-1217-0410-a6f0-8f06a7374b81

Prevent 'has already been taken' error messages for user login and email if…
Prevent 'has already been taken' error messages for user login and email if these fields are left empty. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1042 e93f8b46-1217-0410-a6f0-8f06a7374b81
4a729036 · Jean-Philippe Lang · c9fd7513 · 4a729036
Commit 4a729036 authored Jan 06, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

user.rb app/models/user.rb +2 -1

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,7 +38,8 @@ class User < ActiveRecord::Base
  attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
 	
  validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
-  validates_uniqueness_of :login, :mail	
+  validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }
+  validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }
  # Login must contain lettres, numbers, underscores only
  validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
  validates_length_of :login, :maximum => 30