From 837a9acb48d67afc41642a3183e32c4080cf0604 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 23 Mar 2009 13:54:31 +0000
Subject: [PATCH] * fix the condition and simplify the script.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26130 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_core/Base_getWorkflowHistoryItemList.xml           | 6 ++----
 product/ERP5/bootstrap/erp5_core/bt/revision                | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
index 6175f4cd7e..2e27c26554 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
@@ -128,10 +128,8 @@ for workflow_item in workflow_item_list:\n
         value = \'%s\' % value\n
       elif key == \'actor\':\n
         value = getActorName(value)\n
-      elif same_type(value, \'\') and key in (\'state\' ):\n
-        value = getTranslationStringWithContext(context,value, key, workflow_id)\n
-      elif same_type(value, \'\') and key in ( \'action\'):\n
-        value = getTranslationStringWithContext(context,value, key, workflow_id)\n
+      elif same_type(value, \'\') and key in (\'action\', \'state\'):\n
+        value = getTranslationStringWithContext(context, value, key, workflow_id)\n
     if value is marker:\n
       value = \'Does not exist\'\n
     o.setProperty(key, value)\n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 304d0b051f..a496f023e3 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1125
\ No newline at end of file
+1127
\ No newline at end of file
-- 
2.30.9