From b748c9673efaa9491b19147acfd970438e437fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 15 Jul 2010 11:47:58 +0000 Subject: [PATCH] - rvert 37126 and 37127, as it was wrong way to fix this issue git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37128 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_content_long/default_ram_cache.xml | 24 +++++++- .../erp5_content_medium/default_ram_cache.xml | 24 +++++++- .../erp5_content_short/default_ram_cache.xml | 24 +++++++- .../portal_caches/erp5_session_cache/1.xml | 24 +++++++- .../erp5_ui_long/default_ram_cache.xml | 24 +++++++- .../erp5_ui_medium/default_ram_cache.xml | 24 +++++++- .../erp5_ui_short/default_ram_cache.xml | 24 +++++++- .../default_site_preference.xml | 60 ++++++++++++------- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 9 files changed, 187 insertions(+), 43 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml index 24aaeaceef..d241da4b4e 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml index 703e11442f..2a942420d4 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml index 3f3f2aefed..e12c45b1f3 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml index b712e9e0cc..69c3395389 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_session_cache/1.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml index 24aaeaceef..d241da4b4e 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml index 703e11442f..2a942420d4 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml index 3f3f2aefed..e12c45b1f3 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml @@ -52,13 +52,25 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -66,7 +78,13 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml index 46cd8a2693..93c6aa4d86 100644 --- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml @@ -13,26 +13,17 @@ <key> <string>_Access_contents_information_Permission</string> </key> <value> <tuple> + <string>Anonymous</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Authenticated</string> + <string>Author</string> <string>Manager</string> + <string>Member</string> <string>Owner</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Add_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Owner</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Delete_objects_Permission</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Owner</string> + <string>Reviewer</string> </tuple> </value> </item> @@ -49,8 +40,17 @@ <key> <string>_View_Permission</string> </key> <value> <tuple> + <string>Anonymous</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Authenticated</string> + <string>Author</string> <string>Manager</string> + <string>Member</string> <string>Owner</string> + <string>Reviewer</string> </tuple> </value> </item> @@ -382,13 +382,25 @@ It\'s the lowest priority one; ie. managers can create higher priority preferenc </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Length" module="BTrees.Length"/> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> @@ -396,7 +408,13 @@ It\'s the lowest priority one; ie. managers can create higher priority preferenc </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <global name="OOBTree" module="BTrees._OOBTree"/> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> </pickle> <pickle> <none/> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 4e010ec2ce..1f4f8496fa 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1630 \ No newline at end of file +1631 \ No newline at end of file -- 2.30.9