diff --git a/app/models/user.rb b/app/models/user.rb --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,6 +6,7 @@ validates_presence_of :login validates_presence_of :full_name + validates_length_of :full_name, :minimum => 1 validates_presence_of :password, :if => :password_required? validates_length_of :password, :within => 4..20, :if => :password_required? @@ -29,10 +30,12 @@ end def email_for_editing - if self.email!=nil + if self.email==nil + "(unknown)" + elsif self.email=='' + "(blank)" + else self.email - else - "unknown" end end @@ -41,10 +44,12 @@ end def alias_for_editing - if self.alias!=nil + if self.alias==nil + "(unknown)" + elsif self.alias=='' + "(blank)" + else self.alias - else - "unknown" end end