Fix invitation links not working when invite request text is required (#15385)

Fixes #15383

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

diff --git a/app/models/user.rb b/app/models/user.rb
index 6088f19940f213f1eccfcd44f8aae995c72ee3e4..dd96bbf8cec48ef98595422b88279e27ac436d90 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,7 +83,7 @@ class User < ApplicationRecord
 
   has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
   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 :invite_request, presence: true, on: :create, if: -> { Setting.require_invite_text && !invited? }
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
   validates_with BlacklistedEmailValidator, on: :create