From d5c98dd0c493f5acb2c400d49dca104d34dd9f17 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 20 Jan 2012 17:20:11 -0500 Subject: [PATCH] fixes #289 --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2ad35e791..a063d215b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,8 +18,8 @@ class User < ActiveRecord::Base attr_accessible :level, :as => :admin validates_length_of :name, :within => 2..100, :on => :create validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" - validates_uniqueness_of :name, :case_sensitive => false, :on => :create - validates_uniqueness_of :email, :case_sensitive => false, :on => :create, :if => lambda {|rec| !rec.email.blank?} + validates_uniqueness_of :name, :case_sensitive => false + validates_uniqueness_of :email, :case_sensitive => false, :if => lambda {|rec| rec.email.present?} validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || rec.password.present?} validates_inclusion_of :default_image_size, :in => %w(medium large original) validates_confirmation_of :password