gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix “invited by” not showing up for invited accounts in admin interface (#10791)

Browse source
This commit is contained in:
ThibG 2019-05-19 21:40:36 +02:00 • committed by Eugen Rochko
parent 37a04c329c
commit ae18386558
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -114,6 +114,10 @@ class User < ApplicationRecord
end
def invited?
invite_id.present?
end
def valid_invitation?
invite_id.present? && invite.valid_for_use?
end
@ -274,7 +278,7 @@ class User < ApplicationRecord
private
def set_approved
self.approved = open_registrations? || invited? || external?
self.approved = open_registrations? || valid_invitation? || external?
end
def open_registrations?

2
app/validators/blacklisted_email_validator.rb
View file

@ -2,7 +2,7 @@
class BlacklistedEmailValidator < ActiveModel::Validator
def validate(user)
return if user.invited?
return if user.valid_invitation?
@email = user.email