diff --git a/app/assets/javascripts/sitewide/zebra_print.js b/app/assets/javascripts/sitewide/zebra_print.js index aacd4be0e..82f668c27 100644 --- a/app/assets/javascripts/sitewide/zebra_print.js +++ b/app/assets/javascripts/sitewide/zebra_print.js @@ -182,7 +182,7 @@ var zebraPrint = (function() { repository_id: int } */ - print: function(modalUrl, progressModal, printModal, printData) { + print: function(modalUrl, progressModal, printModal, printData, finishedCallback = null) { var modal = $(progressModal); $.ajax({ method: 'GET', @@ -224,7 +224,7 @@ var zebraPrint = (function() { } }).fail(() => { HelperModule.flashAlertMsg(I18n.t('repository_row.modal_print_label.general_error'), 'danger'); - }); + }).always(() => { if (finishedCallback) finishedCallback(); }); } }; }()); diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue index 11bdbe501..a0fa71ad8 100644 --- a/app/javascript/vue/repository_print_modal/container.vue +++ b/app/javascript/vue/repository_print_modal/container.vue @@ -238,6 +238,9 @@ export default { label_template_id: this.selectedTemplate.id, row_ids: this.row_ids, repository_id: this.repository_id + }, + () => { + this.submitting = false; } ); } else {