diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-25 02:49:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 02:49:25 +0200 |
commit | e451ba0e837eb5b3d4f7fe75ca3e16680afaf129 (patch) | |
tree | 212519b375fa3f963fbaf318e169faf8862ae554 /app/models/user.rb | |
parent | f27d7093513c0265010d019adc01b3f7ea02ef47 (diff) |
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 135baae12..9a0671006 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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?) |