fixed broken password confirmation on password reset

2015-02-23 16:19:06 +01:00
parent dafeb3a706
commit e8d7f172b9
2 changed files with 40 additions and 15 deletions
--- a/app/models/internal_user.rb
+++ b/app/models/internal_user.rb
@ -6,10 +6,15 @@ class InternalUser < ActiveRecord::Base
  has_and_belongs_to_many :teams

  validates :email, presence: true, uniqueness: true
-  validates :password, confirmation: true, on: :update, presence: true, unless: :activated?
+  validates :password, confirmation: true, if: :password_void?, on: :update, presence: true
  validates :role, inclusion: {in: ROLES}

  def activated?
    activation_state == 'active'
  end
+
+  def password_void?
+    activation_token? || reset_password_token?
+  end
+  private :password_void?
 end