From 1838ec552e6d1962dbfe69c847083c55bc6c821f Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Fri, 4 Mar 2011 14:13:53 +0000 Subject: [PATCH] refactor code to warn the user about the problem and reload page when occurs problems of document conversion git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43980 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_web_ung_theme/ung_js/ung.js.xml | 21 +++++++++++++------ bt5/erp5_web_ung_theme/bt/revision | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml index 224f8273bc..97211f001f 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml @@ -79,12 +79,21 @@ function checkConversion(){\n $.get("Base_getDocumentConversionState?path=" + parameterList.document_path, {},\n function(data, textStatus, XMLHttpRequest){\n status = jQuery.parseJSON(data);\n - if (status != "converted"){\n - setTimeout(checkConversion(), 1500);\n - }\n - else {\n - clearTimeout();\n - setTimeout(updateWebPage(), 1000);\n + console.log(status);\n + switch (status) {\n + case "converted":\n + clearTimeout();\n + setTimeout(updateWebPage(), 1000); \n + break;\n + case "conversion_failed":\n + clearTimeout();\n + $("a#loading_message").text("Problems to convert your document...");\n + setTimeout(window.location.href = window.location.href.match("^http.*\\/ung")[0], 3000);\n + break;\n + default:\n + console.log("converted");\n + setTimeout(checkConversion(), 1500); \n + break;\n }\n });\n }\n diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 8bc94cb760..6610e117a3 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -276 \ No newline at end of file +277 \ No newline at end of file -- 2.30.9