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

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed May 16 17:43:34 2007
New Revision: 14505

URL: http://svn.erp5.org?rev=14505&view=rev
Log:
Display message instead of IndexError when displaying Workflow History with missing workflow

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=14505&r1=14504&r2=14505&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 Wed May 16 17:43:34 2007
@@ -100,17 +100,17 @@
     if key.endswith(\'state\'): \n
       key = \'state\'\n
       if display:\n
-        value = wf_states[value].title\n
+        value = wf_states.get(value, None) and wf_states[value].title\n
       else:\n
-        value = wf_states[value].id\n
+        value = wf_states.get(value, None) 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[value].title or wf_transitions[value].actbox_name or value\n
+          value = wf_transitions.get(value, None) and (wf_transitions[value].title or wf_transitions[value].actbox_name) or value\n
         else:\n
-          value = wf_transitions[value].id or wf_transitions[value].actbox_name or value\n
+          value = wf_transitions.get(value, None) 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,6 +118,8 @@
         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
+      value = \'Does not exist\'\n
     o.setProperty(key, value)\n
  \n
   # record current serial as "next serial" for the previous revision\n
@@ -138,6 +140,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>

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=14505&r1=14504&r2=14505&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed May 16 17:43:34 2007
@@ -1,1 +1,1 @@
-333
+334