[Erp5-report] r24072 - /erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 7 16:57:14 CEST 2008
Author: ivan
Date: Tue Oct 7 16:57:12 2008
New Revision: 24072
URL: http://svn.erp5.org?rev=24072&view=rev
Log:
Server returns wrapped result.
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=24072&r1=24071&r2=24072&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py (original)
+++ erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py Tue Oct 7 16:57:12 2008
@@ -370,7 +370,8 @@
# set real method_id
form = self.REQUEST.form
form['method_id'] = distant_method
- return self._callRemoteMethod('proxyMethodHandler', wrap_result=0)
+ rc = self._callRemoteMethod('proxyMethodHandler')
+ return rc['data']
def _callRemoteMethod(self, distant_method, server_url=None, wrap_result=1):
""" Call remote method on server and get result. """
@@ -412,9 +413,6 @@
"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"]
@@ -713,6 +711,8 @@
activity_list = portal_activities.getMessageList()
installation_status['activity_list'].append(len(activity_list))
html = self.WizardTool_viewRunningInstallationMessage(installation_status = installation_status)
+ # set encoding as this is usually called from asynchronous JavaScript call
+ self.REQUEST.RESPONSE.setHeader('Content-Type', 'text/html; charset=utf-8');
return html
security.declarePublic(Permissions.AccessContentsInformation, 'getInstallationStatusReportFromServer')
More information about the Erp5-report
mailing list