Commit dfbb0826 authored by Jérome Perrin's avatar Jérome Perrin

Base_getWorkflowHistoryItemList: Don't mix the cases when the property is not...

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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15297 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 275ed90f
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
from Products.ERP5Type.Document import newTempBase\n from Products.ERP5Type.Document import newTempBase\n
from Products.ERP5Type.Document import newTempMappedValue\n from Products.ERP5Type.Document import newTempMappedValue\n
\n \n
marker = []\n
result = []\n result = []\n
i = 1\n i = 1\n
portal_object = context.getPortalObject()\n portal_object = context.getPortalObject()\n
...@@ -100,17 +101,17 @@ for workflow_item in workflow_item_list:\n ...@@ -100,17 +101,17 @@ for workflow_item in workflow_item_list:\n
if key.endswith(\'state\'): \n if key.endswith(\'state\'): \n
key = \'state\'\n key = \'state\'\n
if display:\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 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 key == \'action\':\n
if value != \'\' and value is not None:\n if value != \'\' and value is not None:\n
if value == "\'edit\'":\n if value == "\'edit\'":\n
value = "edit"\n value = "edit"\n
if display:\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 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 display:\n
if key == \'error_message\' and not same_type(value, \'\'):\n if key == \'error_message\' and not same_type(value, \'\'):\n
value = \'%s\' %value\n value = \'%s\' %value\n
...@@ -118,7 +119,7 @@ for workflow_item in workflow_item_list:\n ...@@ -118,7 +119,7 @@ for workflow_item in workflow_item_list:\n
value = context.Localizer.erp5_ui.gettext(value)\n value = context.Localizer.erp5_ui.gettext(value)\n
elif same_type(value, \'\') and key in ( \'action\', \'state\' ): \n elif same_type(value, \'\') and key in ( \'action\', \'state\' ): \n
value = context.Localizer.erp5_ui.gettext(value)\n value = context.Localizer.erp5_ui.gettext(value)\n
if value is None:\n if value is marker:\n
value = \'Does not exist\'\n value = \'Does not exist\'\n
o.setProperty(key, value)\n o.setProperty(key, value)\n
\n \n
...@@ -205,6 +206,7 @@ return result\n ...@@ -205,6 +206,7 @@ return result\n
<string>Products.ERP5Type.Document</string> <string>Products.ERP5Type.Document</string>
<string>newTempBase</string> <string>newTempBase</string>
<string>newTempMappedValue</string> <string>newTempMappedValue</string>
<string>marker</string>
<string>result</string> <string>result</string>
<string>i</string> <string>i</string>
<string>portal_object</string> <string>portal_object</string>
......
371 373
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment