From 6742a24d04ce677e5d7b65eb6b89083121e8920b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20G=C3=B3rny?= <bartek@gorny.edu.pl> Date: Tue, 19 Dec 2006 11:46:20 +0000 Subject: [PATCH] If we want group, we return all super-groups of the current group; the other script is for using if we want strict membership of the group. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11752 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...Type_getSecurityCategoryFromAssignment.xml | 44 +++- ...etSecurityCategoryFromAssignmentStrict.xml | 230 ++++++++++++++++++ bt5/erp5_dms/bt/revision | 2 +- 3 files changed, 263 insertions(+), 13 deletions(-) create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignment.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignment.xml index 41688e51bf..370b22b4c9 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignment.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignment.xml @@ -80,6 +80,7 @@ \n # must always return a list of dicts\n context.log(\'base_category_list\',base_category_list)\n +context.log(\'user\',user_name)\n category_list = []\n \n person_module = context.portal_url.getPortalObject().getDefaultModule(\'Person\')\n @@ -87,7 +88,7 @@ person_module = context.portal_url.getPortalObject().getDefaultModule(\'Person\' # prevent a very strange bug, sometimes without getObject the\n # assignment is not found\n person_object_list = [x.getObject() for x in person_module.searchFolder(portal_type=\'Person\', reference=user_name)]\n -\n +context.log(len(person_object_list))\n if len(person_object_list) != 1:\n if len(person_object_list) > 1:\n raise ConsistencyError, "Error: There is more than one Person with reference \'%s\'" % user_name\n @@ -99,19 +100,32 @@ if len(person_object_list) != 1:\n person_object = person_object_list[0]\n \n # We look for valid assignments of this user\n +\n for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignment\'}):\n + category_dict = {}\n if assignment.getValidationState() == \'open\':\n - category_dict = {}\n - for base_category in base_category_list:\n - if base_category==\'source_project\':\n - category_value=assignment.getDestinationProject()\n - else:\n - category_value = assignment.getProperty(base_category)\n - if category_value not in (None, \'\'):\n - category_dict[base_category] = category_value\n - 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 + try:\n + for base_category in base_category_list:\n + if base_category==\'source_project\':\n + category_value=assignment.getDestinationProject()\n + else:\n + category_value = assignment.getProperty(base_category)\n + if category_value not in (None, \'\'):\n + category_dict[base_category] = category_value\n + 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 + # are working in group/a/b, too :)\n + if base_category==\'group\':\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 + category_list.append(cdict)\n + except RuntimeError,e:\n + context.log(str(e))\n +\n context.log(category_list)\n return category_list\n @@ -196,6 +210,12 @@ return category_list\n <string>None</string> <string>_write_</string> <string>RuntimeError</string> + <string>grouplist</string> + <string>range</string> + <string>i</string> + <string>cdict</string> + <string>e</string> + <string>str</string> </tuple> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml new file mode 100644 index 0000000000..8e37881ae7 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml @@ -0,0 +1,230 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +# the same, but does group only with strict membership\n +# XXX needs refactoring\n +\n +# must always return a list of dicts\n +context.log(\'base_category_list\',base_category_list)\n +context.log(\'user\',user_name)\n +category_list = []\n +\n +person_module = context.portal_url.getPortalObject().getDefaultModule(\'Person\')\n +# It is better to keep getObject(), in this script this\n +# prevent a very strange bug, sometimes without getObject the\n +# assignment is not found\n +person_object_list = [x.getObject() for x in person_module.searchFolder(portal_type=\'Person\', reference=user_name)]\n +context.log(len(person_object_list))\n +if len(person_object_list) != 1:\n + if len(person_object_list) > 1:\n + raise ConsistencyError, "Error: There is more than one Person with reference \'%s\'" % user_name\n + else:\n + # if a person_object was not found in the module, we do nothing more\n + # this happens for example when a manager with no associated person object\n + # creates a person_object for a new user\n + return []\n +person_object = person_object_list[0]\n +\n +# We look for valid assignments of this user\n +\n +for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignment\'}):\n + category_dict = {}\n + if assignment.getValidationState() == \'open\':\n + try:\n + for base_category in base_category_list:\n + if base_category==\'source_project\':\n + category_value=assignment.getDestinationProject()\n + else:\n + category_value = assignment.getProperty(base_category)\n + if category_value not in (None, \'\'):\n + category_dict[base_category] = category_value\n + 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 +\n + except RuntimeError,e:\n + context.log(str(e))\n +\n +context.log(category_list)\n +return category_list\n + + +]]></string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>base_category_list, user_name, object, portal_type</string> </value> + </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>base_category_list</string> + <string>user_name</string> + <string>object</string> + <string>portal_type</string> + <string>_getattr_</string> + <string>context</string> + <string>category_list</string> + <string>person_module</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>x</string> + <string>person_object_list</string> + <string>len</string> + <string>ConsistencyError</string> + <string>_getitem_</string> + <string>person_object</string> + <string>assignment</string> + <string>category_dict</string> + <string>base_category</string> + <string>category_value</string> + <string>None</string> + <string>_write_</string> + <string>RuntimeError</string> + <string>e</string> + <string>str</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>ERP5Type_getSecurityCategoryFromAssignmentStrict</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 8e9088e93b..8d4011ad25 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -411 \ No newline at end of file +412 \ No newline at end of file -- 2.30.9