[Erp5-report] r12926 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 21 10:09:42 CET 2007
Author: bartek
Date: Wed Feb 21 10:09:39 2007
New Revision: 12926
URL: http://svn.erp5.org?rev=12926&view=rev
Log:
Review and cleanup of generic security scripts.
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryMapping.xml
erp5/trunk/bt5/erp5_dms/bt/revision
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml?rev=12926&r1=12925&r2=12926&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml Wed Feb 21 10:09:39 2007
@@ -77,7 +77,7 @@
\n
* if category is source_project, we look for destination_project\n
\n
-* if category is group, we return not only the group, but also all its parents\n
+* if category not strict, we return not only the category, but also all its parents\n
(unless we say it is strict)\n
"""\n
\n
@@ -118,13 +118,13 @@
else:\n
raise RuntimeError, "Error: \'%s\' property is required in order to update person security group" % (base_category)\n
category_list.append(category_dict)\n
- # if it is group, we go up the hierarchy (because if you work in group/a/b/c, chances are you \n
+ # if not strict, we go up the hierarchy (because if you work in group/a/b/c, chances are you \n
# are working in group/a/b, too :)\n
- if base_category == \'group\' and not strict:\n
+ if not strict:\n
grouplist = category_value.split(\'/\')\n
for i in range(1,len(grouplist)):\n
cdict = category_dict.copy()\n
- cdict[\'group\'] = \'/\'.join(grouplist[:-i])\n
+ cdict[base_category] = \'/\'.join(grouplist[:-i])\n
category_list.append(cdict)\n
except RuntimeError,e:\n
context.log(str(e))\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryMapping.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryMapping.xml?rev=12926&r1=12925&r2=12926&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryMapping.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryMapping.xml Wed Feb 21 10:09:39 2007
@@ -72,13 +72,11 @@
Core security script - defines the way to get security groups of the current user.\n
"""\n
\n
-# XXX-JPS This code is quite frightening. I wonder really what it is for.\n
-\n
return (\n
-(\'ERP5Type_getSecurityCategoryFromAssignmentTree\', [\'function\'] ),\n
-(\'ERP5Type_getSecurityCategoryFromAssignmentTree\', [\'source_project\'] ),\n
-(\'ERP5Type_getSecurityCategoryFromAssignmentTree\', [\'function\', \'source_project\'] ),\n
-(\'ERP5Type_getSecurityCategoryFromAssignmentTree\', [\'group\'] ),\n
+(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\'] ),\n
+(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'source_project\'] ),\n
+(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\', \'source_project\'] ),\n
+(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'group\'] ),\n
(\'ERP5Type_getSecurityCategoryRoot\', [\'group\']),\n
)\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=12926&r1=12925&r2=12926&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Wed Feb 21 10:09:39 2007
@@ -1,1 +1,1 @@
-537
+540
More information about the Erp5-report
mailing list