Improve formatting of note descriptions in GPX and RSS responses

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 79af5d71f66c1836e69213aa812c7af32b66fcb2..0b2a902dfac734f71d18c183cefe5863e579bbe1 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -26,11 +26,11 @@ class User < ActiveRecord::Base
   validates_uniqueness_of :openid_url, :allow_nil => true
   validates_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
-  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_email_format_of :email, :if => Proc.new { |u| u.email_changed? }
+  validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? }
+  validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? }
+  validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? }
+  validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? }
   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