From 665c7876faadc41e1c7a77bb423b951cbcb020ce Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Wed, 20 Sep 2017 13:24:10 +0200 Subject: added email.confirmed scope and fix email comparison --- app/models/email.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/email.rb') diff --git a/app/models/email.rb b/app/models/email.rb index 085663a4fef..041fbbfbe44 100644 --- a/app/models/email.rb +++ b/app/models/email.rb @@ -7,6 +7,8 @@ class Email < ActiveRecord::Base validates :email, presence: true, uniqueness: true, email: true validate :unique_email, if: ->(email) { email.email_changed? } + scope :confirmed, -> { where.not(confirmed_at: nil) } + after_commit :update_invalid_gpg_signatures, if: -> { previous_changes.key?('confirmed_at') } devise :confirmable @@ -19,7 +21,7 @@ class Email < ActiveRecord::Base def unique_email self.errors.add(:email, 'has already been taken') if User.exists?(email: self.email) end - + # once email is confirmed, update the gpg signatures def update_invalid_gpg_signatures user.update_invalid_gpg_signatures if confirmed? -- cgit v1.2.3