[Erp5-report] r32780 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTe...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Feb 18 14:24:54 2010
New Revision: 32780

URL: http://svn.erp5.org?rev=32780&view=rev
Log:
Show server side error message in top tabs instead of "undefined" Javascript variable's value.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml?rev=32780&r1=32779&r2=32780&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml [utf8] Thu Feb 18 14:24:54 2010
@@ -57,6 +57,18 @@
   addOnClickEventsToTabs(req);\n
 }\n
 \n
+function showServerSideError(req) {\n
+  if (loading_deferred) {\n
+    loading_deferred.cancel();\n
+    loading_deferred = undefined;\n
+  }\n
+\n
+  var container = $(\'container\');\n
+  container.innerHTML = \'Server side error.\';\n
+\n
+  addOnClickEventsToTabs(req);\n
+}\n
+\n
 function showLoadingMessage() {\n
   var container = $(\'container\');\n
   container.innerHTML = \'<div><p style="text-align: left; vertical-align: middle; font-size: large;">Loading...</p></div>\';\n
@@ -90,7 +102,7 @@
 \n
   var url = mapping[this.parentNode.id];\n
   var d = doSimpleXMLHttpRequest(url);\n
-  d.addBoth(replaceContent)\n
+  d.addCallbacks(replaceContent, showServerSideError);\n
   e.stop();\n
 \n
   loading_deferred = callLater(0.3, showLoadingMessage);\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=32780&r1=32779&r2=32780&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Thu Feb 18 14:24:54 2010
@@ -1,1 +1,1 @@
-897
+898