From a65d906c7591a7c1d6312d3772b44272f61627b2 Mon Sep 17 00:00:00 2001 From: Jason Etheridge <jason@esilibrary.com> Date: Sat, 14 May 2011 12:58:31 -0400 Subject: [PATCH] robustify exportHandler, assume response of 1 is success for email methods, and make import_item export methods atomic --- Open-ILS/web/js/ui/default/vandelay/vandelay.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js index 7c96ed5117..ea06944971 100644 --- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js +++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js @@ -404,7 +404,7 @@ function vlExportInit() { if(!value) return; if(!confirm('Export as "' + value + '"?')) return; // TODO: i18n - var method = 'open-ils.vandelay.import_item.queue.export.' + value; + var method = 'open-ils.vandelay.import_item.queue.export.' + value + '.atomic'; fieldmapper.standardRequest( ['open-ils.vandelay', method], @@ -425,10 +425,13 @@ function exportHandler(type, response) { try { var content = openils.Util.readResponse(response); if (type=='email') { - if (content) { throw(content); } - return; + if (content==1) { alert('Email sent.'); } + throw(content); } - content = content[0].template_output().data(); + /* handle .atomic versus non-atomic method calls */ + content = content.constructor == Array + ? content[0].template_output().data() + : content.template_output().data(); switch(type) { case 'print': openils.Util.printHtmlString(content); -- 2.11.0