From f11eda3a2a7de3b4644b99bec598a0f0ca8d7125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 26 Apr 2007 21:26:51 +0000
Subject: [PATCH] Move fields to configure preferred_ooodoc_server_address and
preferred_ooodoc_server_port_number for erp5_dms to erp5_core
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14264 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_dms/Preference_viewDocument.xml | 2 --
bt5/erp5_dms/bt/revision | 2 +-
.../erp5_core/Preference_view.xml | 2 ++
.../my_preferred_ooodoc_server_address.xml | 33 +++++++++++++++++--
...my_preferred_ooodoc_server_port_number.xml | 33 +++++++++++++++++--
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
6 files changed, 64 insertions(+), 10 deletions(-)
rename {bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument => product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view}/my_preferred_ooodoc_server_address.xml (91%)
rename {bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument => product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view}/my_preferred_ooodoc_server_port_number.xml (90%)
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument.xml
index 83f6346029..ac467151ba 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument.xml
@@ -74,8 +74,6 @@
<key> <string>left</string> </key>
<value>
<list>
- <string>my_preferred_ooodoc_server_address</string>
- <string>my_preferred_ooodoc_server_port_number</string>
<string>my_preferred_document_file_name_regular_expression</string>
<string>my_preferred_document_reference_regular_expression</string>
<string>my_preferred_document_ingestion_email_notification</string>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index c8a110e7e8..8ec9b982c4 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-621
\ No newline at end of file
+622
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml
index b9ef971a71..26305e9149 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view.xml
@@ -86,6 +86,8 @@
<string>my_priority</string>
<string>my_preferred_section_category</string>
<string>my_preferred_date_order</string>
+ <string>my_preferred_ooodoc_server_address</string>
+ <string>my_preferred_ooodoc_server_port_number</string>
<string>my_translated_preference_state_title</string>
</list>
</value>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_address.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_address.xml
similarity index 91%
rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_address.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_address.xml
index 65f7f6da96..9fa2c090d9 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_address.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_address.xml
@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_ooodoc_server_address</string> </value>
@@ -144,7 +150,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -203,7 +211,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Hostname of the oood server</string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
@@ -243,7 +251,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Conversion server address</string> </value>
+ <value> <string>Conversion Server Address</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
@@ -263,4 +271,23 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python:here.getPortalObject().portal_membership.checkPermission("Manage portal", here)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_port_number.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_port_number.xml
similarity index 90%
rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_port_number.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_port_number.xml
index ddbb6f6491..1df8cd42b1 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Preference_viewDocument/my_preferred_ooodoc_server_port_number.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_ooodoc_server_port_number.xml
@@ -12,6 +12,12 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_ooodoc_server_port_number</string> </value>
@@ -144,7 +150,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>end</string> </key>
@@ -199,7 +207,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Port of the oood server</string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
@@ -243,7 +251,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Conversion server port</string> </value>
+ <value> <string>Conversion Server Port</string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
@@ -255,4 +263,23 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python:here.getPortalObject().portal_membership.checkPermission("Manage portal", here)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index c0d6976f6b..272a4581e9 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-314
\ No newline at end of file
+316
\ No newline at end of file
--
2.30.9