mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-26 01:35:34 +08:00
Fix duplicate assignment modals (#3636)
Co-authored-by: Anton <anton@scinote.net>
This commit is contained in:
parent
e3d08db6de
commit
b0c031e4e3
3 changed files with 9 additions and 11 deletions
|
@ -10,13 +10,6 @@
|
|||
Turbolinks.visit(targetPath);
|
||||
}
|
||||
});
|
||||
|
||||
$(document).on('ajax:success', 'form[data-action*="modal-close"]', function(_, { form, flash }) {
|
||||
$(this).closest('.modal').modal('hide');
|
||||
if (flash) {
|
||||
HelperModule.flashAlertMsg(flash, 'success');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(document).one('turbolinks:load', initModalCloseListeners);
|
||||
|
|
|
@ -9,9 +9,14 @@
|
|||
|
||||
animateSpinner();
|
||||
$.get(ev.currentTarget.getAttribute('href')).then(function({ modal }) {
|
||||
$(modal).on('shown.bs.modal', function() {
|
||||
$(this).find('.selectpicker').selectpicker();
|
||||
}).modal('show');
|
||||
$(modal)
|
||||
.on('shown.bs.modal', function() {
|
||||
$(this).find('.selectpicker').selectpicker();
|
||||
})
|
||||
.on('hidden.bs.modal', function() {
|
||||
$(this).remove();
|
||||
})
|
||||
.modal('show');
|
||||
animateSpinner(null, false);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<%= t '.title', resource_name: resource.name %>
|
||||
</h4>
|
||||
</div>
|
||||
<%= form_with(model: form_object, url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-to-project-form', data: { action: 'modal-close' } }) do |f| %>
|
||||
<%= form_with(model: form_object, url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-to-project-form', data: { action: 'replace-form', target: '#user_assignments_modal' } }) do |f| %>
|
||||
<div class="modal-body">
|
||||
<div class="form-group">
|
||||
<%= text_field_tag :search_users, '', placeholder: t('.find_people_html'), class: 'form-control', data: { action: 'filter-list', target: 'new-user-assignment-to-project-form' } %>
|
||||
|
|
Loading…
Reference in a new issue