From b4eecb4bf43c6388a05186608ed334a68a1a95d4 Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leonardo@nexedi.com>
Date: Tue, 24 Aug 2010 17:50:06 +0000
Subject: [PATCH] Soften dependency on ERP5Type_getSecurityCategoryMapping by
duplicating code from ERP5GroupManager so it can be removed from erp5_core.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37990 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../Base_viewSecurityMappingAsUser.xml | 20 +++++++++++++------
bt5/erp5_administration/bt/revision | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewSecurityMappingAsUser.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewSecurityMappingAsUser.xml
index 1db0ae334a..dcc50d2237 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewSecurityMappingAsUser.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewSecurityMappingAsUser.xml
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
@@ -58,7 +55,16 @@
group_id_list_generator = getattr(context, \'ERP5Type_asSecurityGroupId\')\n
\n
security_category_dict = {}\n
-for method_id, base_category_list in context.ERP5Type_getSecurityCategoryMapping():\n
+# XXX This is a duplicate of logic present deep inside ERP5GroupManager.getGroupsForPrincipal()\n
+# Please refactor into an accessible method so this code can be removed\n
+def getDefaultSecurityCategoryMapping():\n
+ return ((\n
+ \'ERP5Type_getSecurityCategoryFromAssignment\',\n
+ context.getPortalObject().getPortalAssignmentBaseCategoryList()\n
+ ),)\n
+getSecurityCategoryMapping = getattr(context, \'ERP5Type_getSecurityCategoryMapping\', getDefaultSecurityCategoryMapping)\n
+# XXX end of code duplication\n
+for method_id, base_category_list in getSecurityCategoryMapping():\n
try:\n
security_category_dict.setdefault(tuple(base_category_list), []).extend(\n
getattr(context, method_id)(base_category_list, login, context, \'\'))\n
@@ -126,10 +132,12 @@ return printed\n
<string>context</string>
<string>group_id_list_generator</string>
<string>security_category_dict</string>
+ <string>getDefaultSecurityCategoryMapping</string>
+ <string>getSecurityCategoryMapping</string>
<string>_getiter_</string>
- <string>_getattr_</string>
<string>method_id</string>
<string>base_category_list</string>
+ <string>_getattr_</string>
<string>tuple</string>
<string>category_value_list</string>
<string>category_dict</string>
diff --git a/bt5/erp5_administration/bt/revision b/bt5/erp5_administration/bt/revision
index dec4c59e4a..d25720879e 100644
--- a/bt5/erp5_administration/bt/revision
+++ b/bt5/erp5_administration/bt/revision
@@ -1 +1 @@
-104
\ No newline at end of file
+112
\ No newline at end of file
--
2.30.9