Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix invites not being disabled upon account suspension (#11412)

Browse source 
* Disable invite links from disabled/suspended users

* Add has_many invites relationship to users

* Destroy unused invites when suspending an account
This commit is contained in:
ThibG 2019-07-26 18:55:33 +02:00 • committed by Eugen Rochko
parent a6b4440115
commit 92569ffde8
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/invite.rb
View file

@ -17,7 +17,7 @@
class Invite < ApplicationRecord
include Expireable
belongs_to :user
belongs_to :user, inverse_of: :invites
has_many :users, inverse_of: :invite
scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
@ -25,7 +25,7 @@ class Invite < ApplicationRecord
before_validation :set_code
def valid_for_use?
(max_uses.nil? || uses < max_uses) && !expired?
(max_uses.nil? || uses < max_uses) && !expired? && !(user.nil? || user.disabled?)
end
private