[Erp5-report] r15297 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jul 24 16:23:56 2007
New Revision: 15297

URL: http://svn.erp5.org?rev=15297&view=rev
Log:
Base_getWorkflowHistoryItemList: Don't mix the cases when the property is not defined because the workflow configuration have changed and cases where the property is None.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml?rev=15297&r1=15296&r2=15297&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml Tue Jul 24 16:23:56 2007
@@ -72,6 +72,7 @@
 from Products.ERP5Type.Document import newTempBase\n
 from Products.ERP5Type.Document import newTempMappedValue\n
 \n
+marker = []\n
 result = []\n
 i = 1\n
 portal_object = context.getPortalObject()\n
@@ -100,17 +101,17 @@
     if key.endswith(\'state\'): \n
       key = \'state\'\n
       if display:\n
-        value = wf_states.get(value, None) and wf_states[value].title\n
+        value = wf_states.get(value, marker) and wf_states[value].title\n
       else:\n
-        value = wf_states.get(value, None) and wf_states[value].id\n
+        value = wf_states.get(value, marker) and wf_states[value].id\n
     if key == \'action\':\n
       if value != \'\' and value is not None:\n
         if value == "\'edit\'":\n
           value = "edit"\n
         if display:\n
-          value = wf_transitions.get(value, None) and (wf_transitions[value].title or wf_transitions[value].actbox_name) or value\n
+          value = wf_transitions.get(value, marker) and (wf_transitions[value].title or wf_transitions[value].actbox_name) or value\n
         else:\n
-          value = wf_transitions.get(value, None) and (wf_transitions[value].id or wf_transitions[value].actbox_name) or value\n
+          value = wf_transitions.get(value, marker) and (wf_transitions[value].id or wf_transitions[value].actbox_name) or value\n
     if display:\n
       if key == \'error_message\' and not same_type(value, \'\'):\n
         value = \'%s\' %value\n
@@ -118,7 +119,7 @@
         value = context.Localizer.erp5_ui.gettext(value)\n
       elif same_type(value, \'\') and key in ( \'action\', \'state\' ): \n
         value = context.Localizer.erp5_ui.gettext(value)\n
-    if value is None:\n
+    if value is marker:\n
       value = \'Does not exist\'\n
     o.setProperty(key, value)\n
  \n
@@ -205,6 +206,7 @@
                             <string>Products.ERP5Type.Document</string>
                             <string>newTempBase</string>
                             <string>newTempMappedValue</string>
+                            <string>marker</string>
                             <string>result</string>
                             <string>i</string>
                             <string>portal_object</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=15297&r1=15296&r2=15297&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Jul 24 16:23:56 2007
@@ -1,1 +1,1 @@
-371
+373