scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-03 05:29:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3435 from artoscinote/ma_SCI_5900

Browse source 
Fix free invite users modal [SCI-5900]
This commit is contained in:
Miha Mencin 2021-07-13 16:02:23 +02:00 committed by GitHub
commit 76511ac110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/users/settings/teams/invite_users_modal.js
View file

@ -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')) {

2
app/controllers/users/invitations_controller.rb
View file

@ -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']

2
app/views/shared/_invite_users_modal.html.erb
View file

@ -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>