diff --git a/app/assets/javascripts/reports/reports_datatable.js b/app/assets/javascripts/reports/reports_datatable.js index e7cd37475..c763c43b2 100644 --- a/app/assets/javascripts/reports/reports_datatable.js +++ b/app/assets/javascripts/reports/reports_datatable.js @@ -317,15 +317,17 @@ let url = row.attr('data-save-to-inventory-path'); $.get(url, function(result) { let modal = $(result.html); - $('#content-reports-index').append(modal); - modal.modal('show'); - // Remove modal when it gets closed - modal.on('hidden.bs.modal', function() { - $(this).remove(); - }); + if ($('#content-reports-index').find('.modal').length === 0) { + $('#content-reports-index').append(modal); + modal.modal('show'); + // Remove modal when it gets closed + modal.on('hidden.bs.modal', function() { + $(this).remove(); + }); + } }); }); - } + } function initDeleteReports() { $(document).on('click', '#delete-reports-btn', function() { diff --git a/app/services/toolbars/reports_service.rb b/app/services/toolbars/reports_service.rb index 152e45f28..d3b9e0809 100644 --- a/app/services/toolbars/reports_service.rb +++ b/app/services/toolbars/reports_service.rb @@ -59,7 +59,7 @@ module Toolbars label: I18n.t('projects.reports.index.save_pdf_to_inventory'), icon: 'fas fa-save', button_id: 'savePdfToInventoryButton', - type: 'remote-modal' + path: save_pdf_to_inventory_modal_report_path(@report.id) } end