From dd2876d84fcf40c96396d37c65db3abdaaa53636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 20 Feb 2009 14:51:44 +0000
Subject: [PATCH] when a delivery contains multiple line types, it's hard to
understand which line is for which divergence, so add a column to show the
line portal type.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25642 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_base/Delivery_getLineGroupDivergenceList.xml | 1 +
.../line_group_listbox.xml | 10 ++++++++++
bt5/erp5_base/bt/revision | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml
index fdbfeda06e..0adde0fc08 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getLineGroupDivergenceList.xml
@@ -76,6 +76,7 @@ for divergence in divergence_list:\n
object = portal_object.restrictedTraverse(object_relative_url)\n
o = newTempBase(object.getParentValue(), object.getId(), uid=uid,\n
message=str(divergence.getTranslatedMessage()),\n
+ object_portal_type=object.getTranslatedPortalType(),\n
object_title=object.getTranslatedTitle(),\n
prevision_title=prevision_title,\n
decision_title=decision_title,\n
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
index 7c5cd6696f..89d260e111 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_viewSolveDivergenceDialog/line_group_listbox.xml
@@ -350,6 +350,10 @@
<string>object_title</string>
<string>Delivery Line Title</string>
</tuple>
+ <tuple>
+ <string>object_portal_type</string>
+ <string>Delivery Line Type</string>
+ </tuple>
<tuple>
<string>message</string>
<string>Description</string>
@@ -523,6 +527,12 @@
<key> <string>title</string> </key>
<value> <string>Line Level Divergences</string> </value>
</item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>url_columns</string> </key>
<value>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 8db1e5f188..a9d3bc092c 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-522
\ No newline at end of file
+523
\ No newline at end of file
--
2.30.9