diff options
author | azul <azul@riseup.net> | 2012-12-22 04:37:42 -0800 |
---|---|---|
committer | azul <azul@riseup.net> | 2012-12-22 04:37:42 -0800 |
commit | 9a23a5d63b2b5bcb1994137a5de9f8ebd88142f1 (patch) | |
tree | e65b4c4f75e2e8313c67b77aacbd210efbfddd71 /users/app/models/local_email.rb | |
parent | 6e90c173662583ca392ca1cefa7e7dcdc92dbf13 (diff) | |
parent | c83ada50de6b9a7084a23037068ba7f12e09dfc9 (diff) |
Merge pull request #7 from leapcode/feature/validate-email-domain
validating email domain and displaying it as the placeholder
Diffstat (limited to 'users/app/models/local_email.rb')
-rw-r--r-- | users/app/models/local_email.rb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb index c654fcb..d23df71 100644 --- a/users/app/models/local_email.rb +++ b/users/app/models/local_email.rb @@ -3,15 +3,22 @@ class LocalEmail < Email validate :unique_on_server validate :unique_alias_for_user validate :differs_from_main_email + before_validation :add_domain_if_needed + validates :email, + :presence => true, + :format => { :with => /@#{APP_CONFIG[:domain]}\Z/, + :message => "needs to end in @#{APP_CONFIG[:domain]}"} validates :casted_by, :presence => true def to_partial_path "emails/email" end + protected + def unique_on_server - has_email = User.find_by_email_or_alias(email) - if has_email && has_email != self.base_doc + has_email = User.find_by_email_or_alias(email) + if has_email && has_email != self.base_doc errors.add :email, "has already been taken" end end @@ -24,11 +31,19 @@ class LocalEmail < Email end def differs_from_main_email + # If this has not changed but the email let's mark the email invalid instead. + return if self.persisted? user = self.casted_by if user.email == self.email errors.add :email, "may not be the same as your email address" end end + def add_domain_if_needed + if email.blank? + errors.add :email, "may not be empty." + end + self.email += "@" + APP_CONFIG[:domain] unless self.email.include?("@") + end end |