diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js index feb188a92..b628d025d 100644 --- a/app/assets/javascripts/my_modules/protocols.js +++ b/app/assets/javascripts/my_modules/protocols.js @@ -453,7 +453,17 @@ function destroyLoadFromRepositoryTable(content) { function loadFromRepository() { var modal = $("#load-from-repository-modal"); - if (selectedRow !== null && confirm(I18n.t("my_modules.protocols.load_from_repository_modal.confirm_message"))) { + var check_linked = $("[data-role='protocol-status-bar']") + .text(); + + var confirm_message= ""; + if( check_linked.trim() !== '(unlinked)' ){ + confirm_message = I18n.t("protocols.import_export.import_modal.import_to_linked_task"); + } else { + confirm_message = I18n.t("my_modules.protocols.load_from_repository_modal.confirm_message"); + } + + if (selectedRow !== null && confirm(confirm_message) ) { // POST via ajax $.ajax({ url: modal.attr("data-url"), @@ -549,4 +559,4 @@ initLoadFromRepository(); initRefreshStatusBar(); initImport(); initExport(); -initTutorial(); \ No newline at end of file +initTutorial(); diff --git a/app/assets/javascripts/protocols/import_export/import.js.erb b/app/assets/javascripts/protocols/import_export/import.js.erb index 81eb110bd..d643225ee 100644 --- a/app/assets/javascripts/protocols/import_export/import.js.erb +++ b/app/assets/javascripts/protocols/import_export/import.js.erb @@ -330,22 +330,21 @@ function importProtocolFromFile( /* Actual import */ function importCurrentProtocol() { - // Check for confirmation first - var path = new RegExp("modules"); + var check_linked = $("[data-role='protocol-status-bar']") .text(); - if( path.test( window.location.href ) && check_linked === '(unlinked)' ){ - console.log("linked"); + var confirm_message = ""; + if( check_linked.trim() !== '(unlinked)' ){ confirm_message = I18n.t("protocols.import_export.import_modal.import_to_linked_task"); } else { - console.log("unlinked"); confirm_message = I18n.t("protocols.import_export.import_modal.import_into_protocol_confirm"); } + // Check for confirmation first if (importIntoProtocol && !confirm(confirm_message)) { importModal.modal("hide"); } else { - + var path = new RegExp("modules"); if( path.test( window.location.href ) ){ animateSpinner(); importSingleProtocol(currentProtocol, false, function(data) {