diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index b9da2f487..2e568aad3 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -1,7 +1,20 @@ //= require repositories/import/records_importer.js -(function() { +(function(global) { 'use strict'; + global.pageReload = function() { + animateSpinner(); + location.reload(); + } + + function reloadOnHidden() { + $('#modal-import-records') + .on('hidden.bs.modal', function() { + animateSpinner(); + location.reload(); + }); + } + function initImportRecordsModal() { $('#importRecordsButton').off().on('click', function() { $('#modal-import-records').modal('show'); @@ -13,7 +26,12 @@ $('#form-records-file').on('ajax:success', function(ev, data) { $('#modal-import-records').modal('hide'); $(data.html).appendTo('body').promise().done(function() { - $('#parse-records_modal').modal('show'); + $('#parse-records_modal') + .modal('show') + .on('hidden.bs.modal', function() { + animateSpinner(); + location.reload(); + }); repositoryRecordsImporter(); }); }); @@ -34,6 +52,7 @@ pane.tab('show').promise().done(function() { initImportRecordsModal(); }); + reloadOnHidden() }, error: function (error) { // TODO @@ -63,4 +82,4 @@ loadRepositoryTab(); initImportRecordsModal(); }); -})(); +})(window); diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index f01dd4139..728a6c8b6 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -2120,3 +2120,7 @@ th.custom-field .modal-tooltiptext { .my_module-state-buttons { padding-top: 6px; } + +.parse-records-table { + max-height: 200px; +} diff --git a/app/views/repositories/_import_repository_records_modal.html.erb b/app/views/repositories/_import_repository_records_modal.html.erb index 72ca2387a..80d574f96 100644 --- a/app/views/repositories/_import_repository_records_modal.html.erb +++ b/app/views/repositories/_import_repository_records_modal.html.erb @@ -2,7 +2,7 @@