[Erp5-report] r24319 - in /erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core: S...

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Oct 24 16:07:40 2008
New Revision: 24319

URL: http://svn.erp5.org?rev=24319&view=rev
Log:
2008-10-24 yusei
* Backport bugfix. Fixed Folder_generateWorkflowReport. This did not work if there is interaction workflow.

Modified:
    erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml
    erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/change_log
    erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml?rev=24319&r1=24318&r2=24319&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml (original)
+++ erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_generateWorkflowReport.xml Fri Oct 24 16:07:40 2008
@@ -90,7 +90,7 @@
   # XXX requires manager proxy role\n
   workflow_for_ptype = portal_workflow.getWorkflowsFor(portal_type)\n
   for workflow in workflow_for_ptype:\n
-    if hasattr(workflow, \'states\') and state in workflow.states.objectIds():\n
+    if getattr(workflow, \'states\', None) is not None and state in workflow.states.objectIds():\n
       saved_state_dict[state] = translateString(getattr(workflow.states, state).title_or_id())\n
       return saved_state_dict[state]\n
 \n

Modified: erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=24319&r1=24318&r2=24319&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/change_log (original)
+++ erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/change_log Fri Oct 24 16:07:40 2008
@@ -1,3 +1,6 @@
+2008-10-24 yusei
+* Backport bugfix. Fixed Folder_generateWorkflowReport. This did not work if there is interaction workflow.
+
 2008-09-24 yusei
 * Update xml format.
 

Modified: erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/revision?rev=24319&r1=24318&r2=24319&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/branches/version-5.2.1/products/ERP5/bootstrap/erp5_core/bt/revision Fri Oct 24 16:07:40 2008
@@ -1,1 +1,1 @@
-986
+987