From 98f6b3bdce7983302d5eb22fac93f58a0d61fe02 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date: Thu, 11 Oct 2012 16:00:23 +0900
Subject: [PATCH] Fix dead ProxyFields.
PasswordTool_viewResetPassword/text_content from erp5_core wrongly requires
Field Library in erp5_web and EmbeddedFile_view/my_description from erp5_base
wrongly requires Field Library in erp5_dms.
---
.../erp5_base/EmbeddedFile_view/my_description.xml | 2 +-
bt5/erp5_base/bt/change_log | 5 ++++-
.../PasswordTool_viewResetPassword/text_content.xml | 2 +-
product/ERP5/bootstrap/erp5_core/bt/change_log | 3 +++
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/EmbeddedFile_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/EmbeddedFile_view/my_description.xml
index f2f779f4a5..045b8f534a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/EmbeddedFile_view/my_description.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/EmbeddedFile_view/my_description.xml
@@ -79,7 +79,7 @@
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Document_viewFieldLibrary</string> </value>
+ <value> <string>File_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index 14752ff56c..5e6485b240 100644
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,3 +1,6 @@
+2012-10-11 arnaud.fontaine
+* Fix dead ProxyField as Document_viewFieldLibrary is only available in erp5_dms which depends upon erp5_base itself.
+
2012-04-10 Kazuhiko
* add an external method to generate barcode image.
@@ -425,4 +428,4 @@ and query_workflow for Cancelled and Answered states
* Two skins were moved from portal_skins/erp5_core to portal_skins/erp5_base
2006-02-24 Seb
-* Created this business template in order to split erp5_core
\ No newline at end of file
+* Created this business template in order to split erp5_core
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewResetPassword/text_content.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewResetPassword/text_content.xml
index 32769bc439..6d75e61285 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewResetPassword/text_content.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PasswordTool_viewResetPassword/text_content.xml
@@ -131,7 +131,7 @@
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewWebFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index fa93bfb5ab..b1cc8f3201 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,6 @@
+2012-10-11 arnaud.fontaine
+* Fix dead ProxyField after renaming of ProxyFields (now available in erp5_core_proxy_field_legacy).
+
2012-09-04 arnaud.fontaine
* message_attribute_does_not_match was incorrectly renamed to message_attribute_match when migrating StringAttributeMatch constraint from filesystem to ZODB.
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index ee532f37f7..ecc39f2eb9 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-41082
\ No newline at end of file
+41083
\ No newline at end of file
--
2.30.9