Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)

Browse source
This commit is contained in:
Eugen Rochko 2019-04-25 02:49:25 +02:00 • committed by GitHub
parent f27d709351
commit e451ba0e83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -107,6 +107,7 @@ class User < ApplicationRecord
:expand_spoilers, :default_language, :aggregate_reblogs, :show_application, to: :settings, prefix: :setting, allow_nil: false
attr_reader :invite_code
attr_writer :external
def confirmed?
confirmed_at.present?
@ -273,13 +274,17 @@ class User < ApplicationRecord
private
def set_approved
self.approved = open_registrations? || invited?
self.approved = open_registrations? || invited? || external?
end
def open_registrations?
Setting.registrations_mode == 'open'
end
def external?
@external
end
def sanitize_languages
return if chosen_languages.nil?
chosen_languages.reject!(&:blank?)