From ff0ac9f497ae3b49ecfcafb219981737d49d07d6 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 13 Jul 2021 15:51:05 +0200
Subject: [PATCH] Fix free invite users modal [SCI-5900]

---
 .../javascripts/users/settings/teams/invite_users_modal.js      | 1 +
 app/controllers/users/invitations_controller.rb                 | 2 +-
 app/views/shared/_invite_users_modal.html.erb                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/users/settings/teams/invite_users_modal.js b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
index 6d0b95a40..84764aace 100644
--- a/app/assets/javascripts/users/settings/teams/invite_users_modal.js
+++ b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
@@ -137,6 +137,7 @@
             data.role = modal.attr('data-team-role');
             break;
           case 'invite':
+            data.team_ids = [];
             break;
           case 'invite_with_team_selector':
             if (teamSelectorCheckbox.is(':checked')) {
diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb
index 606b9513b..2670923b9 100644
--- a/app/controllers/users/invitations_controller.rb
+++ b/app/controllers/users/invitations_controller.rb
@@ -204,7 +204,7 @@ module Users
       @emails = params[:emails]&.map(&:downcase)
 
       @teams = Team.where(id: params[:team_ids]).select { |team| can_manage_team_users?(team) }
-      return render_403 if @teams.none?
+      return render_403 if params[:team_ids].present? && @teams.none?
 
       @role = params['role']
 
diff --git a/app/views/shared/_invite_users_modal.html.erb b/app/views/shared/_invite_users_modal.html.erb
index 1959b6e6f..e08f572e0 100644
--- a/app/views/shared/_invite_users_modal.html.erb
+++ b/app/views/shared/_invite_users_modal.html.erb
@@ -72,7 +72,7 @@ invite_with_team_selector = type.in?(%w(invite_new_members invite_with_team_sele
             <% end %>
           </p>
 
-          <% if type == 'invite_new_members' %>
+          <% if type.in? ['invite_new_members', 'invite'] %>
             <p><%= t('invite_users.new_members.description') %></p>
             <h4 class="heading">
               <span><%= t('invite_users.new_members.input_label') %></span>