[Erp5-report] r24021 - /erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Oct  6 14:55:55 2008
New Revision: 24021

URL: http://svn.erp5.org?rev=24021&view=rev
Log:
Use server side i18n messages.

Modified:
    erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

Modified: erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py?rev=24021&r1=24020&r2=24021&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py (original)
+++ erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py Mon Oct  6 14:55:55 2008
@@ -365,7 +365,14 @@
     witch_tool = server.portal_witch
     return witch_tool
 
-  def _callRemoteMethod(self, distant_method, server_url=None):
+  def callRemoteProxyMethod(self, distant_method, server_url=None):
+    """ Call proxy method on server. """
+    # set real method_id
+    form = self.REQUEST.form
+    form['method_id'] = distant_method
+    return self._callRemoteMethod('proxyMethodHandler', wrap_result=0)
+
+  def _callRemoteMethod(self, distant_method, server_url=None, wrap_result=1):
     """ Call remote method on server and get result. """
     result_call = GeneratorCall()
     if server_url is None:
@@ -405,6 +412,9 @@
                           "next": None,
                           "previous": None})
     else:
+      if not wrap_result:
+        # simply return raw result
+        return html
       result_call.load(html)
       command = result_call["command"]
       html = result_call["data"]
@@ -679,7 +689,7 @@
     portal_activities = getToolByName(self.getPortalObject(), 'portal_activities')
     is_bt5_installation_over = (portal_activities.countMessageWithTag('initialERP5Setup')==0)
     if 0 == len(portal_activities.getMessageList()) and is_bt5_installation_over:
-      html = self.WizardTool_successfulConfiguration()
+      html = self.callRemoteProxyMethod('WizardTool_successfulConfiguration')
     else:
       if is_bt5_installation_over:
         # only if bt5s are installed start tracking number of activities