diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-14 18:56:16 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-14 19:03:40 +0000 |
| commit | bc0cc811e80143d0255d86433a80a823d1141dd0 (patch) | |
| tree | 0c5005b2b03e540d8ab562da06539414709fbc18 /app/models/change_email_validator.rb | |
| parent | 6fa9c17c7cd5551489a77f6e89543b7886be51d4 (diff) | |
| parent | 2c5749d4d92e6601856cef6f7e2201d06d885183 (diff) | |
Diffstat (limited to 'app/models/change_email_validator.rb')
| -rw-r--r-- | app/models/change_email_validator.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb index 9ef25217d..2ddebb177 100644 --- a/app/models/change_email_validator.rb +++ b/app/models/change_email_validator.rb @@ -28,12 +28,15 @@ class ChangeEmailValidator < ActiveRecord::BaseWithoutTable validates_presence_of :old_email, :message => N_("Please enter your old email address") validates_presence_of :new_email, :message => N_("Please enter your new email address") validates_presence_of :password, :message => N_("Please enter your password"), :unless => :changing_email + validate :password_and_format_of_email def changing_email() self.user_circumstance == 'change_email' end - def validate + private + + def password_and_format_of_email if !self.old_email.blank? && !MySociety::Validate.is_valid_email(self.old_email) errors.add(:old_email, _("Old email doesn't look like a valid address")) end |