[Erp5-report] r43980 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Mar  4 15:13:53 2011
New Revision: 43980

URL: http://svn.erp5.org?rev=43980&view=rev
Log:
refactor code to warn the user about the problem and reload page when occurs problems of document conversion

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Fri Mar  4 15:13:53 2011
@@ -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

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Mar  4 15:13:53 2011
@@ -1 +1 @@
-276
\ No newline at end of file
+277
\ No newline at end of file