[Erp5-report] r32774 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Feb 18 14:04:36 2010
New Revision: 32774

URL: http://svn.erp5.org?rev=32774&view=rev
Log:
Show nice "server side error" message rather than "Loading ..." forever in case asynchronous request to server did not succeeded (due to server side error).

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml?rev=32774&r1=32773&r2=32774&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] Thu Feb 18 14:04:36 2010
@@ -15,7 +15,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts66484637.32</string> </value>
+            <value> <string>ts66498134.37</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -102,13 +102,15 @@
  request_params[\'is_gadget_mode:int\'] = 1; \n
  request_params[\'editable_mode:int\'] = editable_mode; \n
 \n
- getElement(dom_id).style.opacity = 0.5; //innerHTML = \'<div><p style="text-align: left; vertical-align: middle; font-size: large;">Loading...</p></div>\';\n
+ getElement(dom_id).style.opacity = 0.5;\n
  d = MochiKit.Async.doSimpleXMLHttpRequest(url, request_params);\n
- d.addCallback(handleServerSuccess);\n
+ d.addCallbacks(handleServerSuccess, handleServerError);\n
  function handleServerSuccess(res){\n
       getElement(dom_id).innerHTML = res.responseText;\n
-      getElement(dom_id).style.opacity = 1.0;\n
- }\n
+      getElement(dom_id).style.opacity = 1.0;};\n
+ function handleServerError(res){\n
+      getElement(dom_id).innerHTML = \'Server side error.\';\n
+      getElement(dom_id).style.opacity = 1.0;};\n
 }\n
 \n
 function checkForActivitiesOnServer(timeout, return_url, mode, default_pad_group){\n
@@ -377,7 +379,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <long>13496</long> </value>
+            <value> <long>13542</long> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=32774&r1=32773&r2=32774&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Thu Feb 18 14:04:36 2010
@@ -1,1 +1,1 @@
-480
+481