Fix errors when an existing user tries to agree to the new terms

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index f99ad3b40a8a51680b97f0b7c19b4fcd5504e13b..d5b75d073a2d14582a106c725f93d907b4e4d045 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,6 +29,8 @@ class User < ActiveRecord::Base
   validates_email_format_of :email
   validates_email_format_of :new_email, :allow_blank => true
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+  validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace"
+  validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace"
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true