From ed46dda1f45c1e9f038446dba45bba7b5f83bb0f Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date: Fri, 11 Nov 2011 13:45:19 +0900
Subject: [PATCH] Do not override portal_type for Catalog search when already
given as a parameter of Document_getOtherVersionDocumentList.
This fixes test_Document_getOtherVersionDocumentList from
testDmsWithPreConversion.TestDocumentWithPreConversion.
---
.../erp5_dms/Document_getOtherVersionDocumentList.xml | 3 ++-
bt5/erp5_dms/bt/change_log | 3 +++
bt5/erp5_dms/bt/revision | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getOtherVersionDocumentList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getOtherVersionDocumentList.xml
index 24aa84f51d..abf737b27a 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getOtherVersionDocumentList.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getOtherVersionDocumentList.xml
@@ -64,7 +64,8 @@ if kw[\'reference\'] is None:\n
# we can not find other "verions" of this document as it doesn\'t have a reference\n
return []\n
kw[\'uid\'] = \'!=%s\' %document.getUid()\n
-kw[\'portal_type\'] = context.getPortalDocumentTypeList()\n
+if \'portal_type\' not in kw:\n
+ kw[\'portal_type\'] = context.getPortalDocumentTypeList()\n
return portal.portal_catalog(**kw)\n
</string> </value>
</item>
diff --git a/bt5/erp5_dms/bt/change_log b/bt5/erp5_dms/bt/change_log
index 70e3c5af44..e0e6f28213 100644
--- a/bt5/erp5_dms/bt/change_log
+++ b/bt5/erp5_dms/bt/change_log
@@ -1,3 +1,6 @@
+2011-11-11 arnaud.fontaine
+* Do not override portal_type for Catalog search when already given as a parameter of Document_getOtherVersionDocumentList.
+
2011-03-28 Kazuhiko
* we should have at most only one published/released/shared document for each reference/language, i.e. we should not have both published and released document with the same reference/language at the same time.
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 94ad64da68..1e36b9134a 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-1257
\ No newline at end of file
+1258
\ No newline at end of file
--
2.30.9