diff --git a/cms/templates/import.html b/cms/templates/import.html index 27337bf235..2973d6ef4f 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -77,16 +77,12 @@ $('#fileupload').fileupload({ e.preventDefault(); submitBtn.hide(); data.submit().complete(function(result, textStatus, xhr) { - if (result.status != 200) { - alert('${_("Your import has failed.")}\n\n' + JSON.parse(result.responseText)["ErrMsg"]); + if (xhr.status != 200) { + var errMsg = result.hasOwnProperty("ErrMsg") ? result["ErrMsg"] : "" ; + alert('${_("Your import has failed.")}\n\n' + errMsg); submitBtn.show(); bar.hide(); - } else { - if (result.responseText["ImportStatus"] == 1) { - bar.hide(); - statusBlock.show(); - } - } + } }); }); } else { @@ -102,13 +98,17 @@ $('#fileupload').fileupload({ }, done: function(e, data){ bar.hide(); + window.onbeforeunload = null; alert('${_("Your import was successful.")}'); window.location = '${successful_import_redirect_url}'; }, + start: function(e) { + window.onbeforeunload = function() { + return '${_("Your import is in progress; navigating away will abort it.")}'; + } + }, sequentialUploads: true - - }); })();