diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-14 10:03:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 10:03:09 +0100 |
| commit | 47e507fa61be6dc39dd9821e1d07c33e993cc246 (patch) | |
| tree | a628d53e554ba02a633615b5234698eebe902fab /app/models/user.rb | |
| parent | a7e819b8a8de25414324e354baa62e9abbd3e8c4 (diff) | |
Add ability to require invite request text (#15326)
Fixes #15273 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 981dc6d47..6088f1994 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -82,7 +82,8 @@ class User < ApplicationRecord has_many :webauthn_credentials, dependent: :destroy has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy - accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? } + accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text } + validates :invite_request, presence: true, on: :create, if: -> { Setting.require_invite_text } validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? validates_with BlacklistedEmailValidator, on: :create |