scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-30 19:48:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1414 from mlorb/ml-sci-2899

Browse source 
Fix invited member is added multiple times to team [SCI-2899]
This commit is contained in:
mlorb 2018-12-12 11:26:41 +01:00 committed by GitHub
commit 8170e1b367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
maxTags: modal.data('max-tags')
});
modal.on('show.bs.modal', function() {
modal.off('show.bs.modal').on('show.bs.modal', function() {
// This cannot be scoped outside this function
// because it is generated via JS
teamSelectorDropdown2 = teamSelectorDropdown.parent()
@ -83,7 +83,7 @@
});
// Click action
modal.find('[data-action=invite]').on('click', function() {
modal.find('[data-action=invite]').off('click').on('click', function() {
var data = {
emails: tagsInput.val()
};

2
app/views/users/settings/teams/show.html.erb
View file

@ -93,7 +93,7 @@
<div class="panel-body">
<div class="col-xs-24 col-sm-12">
<a href="#" class="btn btn-primary pull-right row" data-trigger="invite-users"
data-modal-id="team-invite-users-modal">
data-turbolinks="false" data-modal-id="team-invite-users-modal">
<span class="fas fa-plus"></span>
<%= t("users.settings.teams.edit.add_user") %>
</a>