Drop SoftwareType_getSecurityCategoryFromAggregateMovementItemByPerson.

Directly fetch person information from related Hosting Subscription.

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Slave%20Instance.xml

@@ -6,7 +6,7 @@
   </role>
   <role id='Assignee'>
    <property id='title'>Customer of the Instance</property>
-   <property id='base_category_script'>SoftwareType_getSecurityCategoryFromAggregateMovementItemByPerson</property>
+   <property id='base_category_script'>InstanceType_getSecurityCategoryFromUser</property>
    <multi_property id='base_category'>destination_section</multi_property>
   </role>
   <role id='Assignor'>

master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Software%20Instance.xml

@@ -6,7 +6,7 @@
   </role>
   <role id='Assignee'>
    <property id='title'>Customer of the Instance</property>
-   <property id='base_category_script'>SoftwareType_getSecurityCategoryFromAggregateMovementItemByPerson</property>
+   <property id='base_category_script'>InstanceType_getSecurityCategoryFromUser</property>
    <multi_property id='base_category'>destination_section</multi_property>
   </role>
   <role id='Assignor'>

master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareType_getSecurityCategoryFromAggregateMovementItemByPerson.xml → master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_core/InstanceType_getSecurityCategoryFromUser.xml

@@ -50,48 +50,48 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-# XXX For now, this script requires proxy manager\n
+            <value> <string>"""\n
+This script returns a list of dictionaries which represent\n
+the security groups which a person is member of. It extracts\n
+the categories from the current content. It is useful in the\n
+following cases:\n
 \n
-# base_category_list : list of category values we need to retrieve\n
-# user_name : string obtained from getSecurityManager().getUser().getUserName() [NuxUserGroup]\n
-#             or from getSecurityManager().getUser().getId() [PluggableAuthService with ERP5GroupManager]\n
-# object : object which we want to assign roles to.\n
-# portal_type : portal type of object\n
+- calculate a security group based on a given\n
+  category of the current object (ex. group). This\n
+  is used for example in ERP5 DMS to calculate\n
+  document security.\n
 \n
-# must always return a list of dicts\n
+- assign local roles to a document based on\n
+  the person which the object related to through\n
+  a given base category (ex. destination). This\n
+  is used for example in ERP5 Project to calculate\n
+  Task / Task Report security.\n
+\n
+The parameters are\n
+\n
+  base_category_list -- list of category values we need to retrieve\n
+  user_name          -- string obtained from getSecurityManager().getUser().getId()\n
+  object             -- object which we want to assign roles to\n
+  portal_type        -- portal type of object\n
+\n
+NOTE: for now, this script requires proxy manager\n
+"""\n
 \n
 category_list = []\n
 \n
 if obj is None:\n
   return []\n
 \n
-movement_portal_type = ["Sale Packing List Line", "Sale Order Line"]\n
-\n
-portal = obj.getPortalObject()\n
-\n
-security_dict = {}\n
+hosting_subscription = obj.getSpecialiseValue(portal_type="Hosting Subscription")\n
+if hosting_subscription is not None:\n
+  person = hosting_subscription.getDestinationSectionValue(portal_type="Person")\n
+  if person is not None:\n
 \n
-parent_url_list = []\n
-for movement in portal.portal_catalog(\n
-  portal_type=movement_portal_type,\n
-  strict_aggregate_uid=obj.getUid(),\n
-  default_resource_uid=portal.restrictedTraverse(portal.portal_preferences.getPreferredInstanceSetupResource()).getUid(),\n
-#   simulation_state=(\'ordered\', \'confirmed\', \'started\', \'stopped\'),\n
-  limit=1,\n
-  ):\n
-  item = movement.getDestinationSectionValue(portal_type="Person")\n
-  if item is not None:\n
-    parent_url_list.append(item.getRelativeUrl())\n
+    for base_category in base_category_list:\n
+      category_list.append({base_category: [person.getRelativeUrl()]})\n
 \n
-if len(parent_url_list) > 0:\n
-  parent_url_list.sort()\n
-  category_list.append({"destination_section": parent_url_list})\n
 return category_list\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -107,7 +107,7 @@ return category_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SoftwareType_getSecurityCategoryFromAggregateMovementItemByPerson</string> </value>
+            <value> <string>InstanceType_getSecurityCategoryFromUser</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_erp5/bt/revision

-6
+7
\ No newline at end of file

master/bt5/vifib_erp5/bt/revision

-509
+510
\ No newline at end of file