diff --git a/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_officejs_create_bad_document.js.js b/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_officejs_create_bad_document.js.js index a5e70510af51570319597a5c0b31e0612aef2f28..670e13bff10b06375c2e7b5f1999490a2ca0d454 100644 --- a/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_officejs_create_bad_document.js.js +++ b/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_officejs_create_bad_document.js.js @@ -11,12 +11,13 @@ }), gadget = this; return storage.put('bad_document', { - 'filename': 'test.xlsx', + 'reference': 'bad_document_ooffice_upload', 'title': 'Bad Document', + 'filename': 'test.xlsx', 'portal_type': 'Spreadsheet', - 'mime_type': 'xlsx', - 'modification_date': 'Fri, 17 Aug 2018 11:21:22 +0000', - 'content_type': "application/x-asc-spreadsheet" + 'parent_relative_url': "document_module", + 'content_type': "application/x-asc-spreadsheet", + 'modification_date': 'Fri, 17 Aug 2018 11:21:22 +0000' }) .push(function (id) { return jIO.util.ajax({ @@ -42,6 +43,10 @@ var div = document.createElement('div'); div.textContent = 'Document Created'; gadget.element.appendChild(div); + }, function (error) { + var div = document.createElement('div'); + div.textContent = 'Error creating document: ' + error.message; + gadget.element.appendChild(div); }); }); }(window, rJS, jIO, document, URL)); diff --git a/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_ooffice_convert_check.js.js b/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_ooffice_convert_check.js.js index fb170eda0d3c0c175662551cedfba02d00098aeb..a0dfb27e23ea8eb33437b3537fe95d10ca6edaa0 100644 --- a/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_ooffice_convert_check.js.js +++ b/bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/gadget_ooffice_convert_check.js.js @@ -4,10 +4,11 @@ "use strict"; function check(gadget, storage, format) { + var output_message = "output_message not set - there was an error"; return new RSVP.Queue() .push(function () { return RSVP.all([ - storage.getAttachment('test', format), + storage.getAttachment('test', 'data'), jIO.util.ajax({ type: "GET", url: new URL('./test_ooo_' + gadget.param.type + '.' + format, window.location.href), @@ -20,13 +21,16 @@ jIO.util.readBlobAsText(result[0]), jIO.util.readBlobAsText(result[1].target.response) ]); + }, function (error) { + output_message = 'ERROR converting document: ' + error.message; }) .push(function (result) { var div = window.document.createElement('div'); - if (result[0].target.response == result[1].target.response) { - div.textContent = 'Converted ' + format + ' OK'; - gadget.element.appendChild(div); + if (result && result[0].target.response == result[1].target.response) { + output_message = 'Converted ' + format + ' OK'; } + div.textContent = output_message; + gadget.element.appendChild(div); }); }