Remove proxy role from security category scripts, because they are called from unrestricted method.

f6ae22f1 · Kazuhiko Shiozaki · 6d7d2253 · f6ae22f1 · f6ae22f1 · f6ae22f1
Commit f6ae22f1 authored Aug 30, 2013 by Kazuhiko Shiozaki
9 changed files
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentStrict.xml
@@ -62,14 +62,6 @@ return context.ERP5Type_getSecurityCategoryFromAssignmentTree(base_category_list
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromAssignmentStrict</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
@@ -63,7 +63,6 @@ Differences to the stock implementation:\n
  (unless we say it is strict)\n
 """\n
 \n
-# XXX For now, this script requires proxy manager to retrieve the Person object in all cases\n
 from Products.ERP5Type.Log import log\n
 \n
 category_list = []\n
@@ -121,14 +120,6 @@ return category_list\n
            <key> <string>_params</string> </key>
            <value> <string>base_category_list, user_name, object, portal_type, strict=False, root=False</string> </value>
        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromAssignmentTree</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestination.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestination.xml
@@ -78,14 +78,6 @@ return category_list\n
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromDestination</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestinationAssignment.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestinationAssignment.xml
@@ -80,14 +80,6 @@ return category_list\n
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromDestinationAssignment</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromObjectAssignment.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromObjectAssignment.xml
@@ -84,14 +84,6 @@ return category_list\n
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromObjectAssignment</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromUser.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromUser.xml
@@ -93,14 +93,6 @@ return category_list\n
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromUser</string> </value>

--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryRoot.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryRoot.xml
@@ -65,14 +65,6 @@ return context.ERP5Type_getSecurityCategoryFromAssignmentTree(base_category_list
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryRoot</string> </value>

--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_security/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_security/ERP5Type_getSecurityCategoryFromAssignmentTree.xml
@@ -63,8 +63,6 @@ Differences to the stock implementation:\n
  (unless we say it is strict)\n
 """\n
 \n
-\n
-# XXX For now, this script requires proxy manager to retrieve the Person object in all cases\n
 from Products.ERP5Type.Log import log\n
 \n
 category_list = []\n
@@ -126,15 +124,6 @@ return category_list\n
            <key> <string>_params</string> </key>
            <value> <string>base_category_list, user_name, object, portal_type, strict=False, root=False</string> </value>
        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromAssignmentTree</string> </value>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml
@@ -66,8 +66,6 @@ The parameters are\n
  user_name          -- the user identifier (not used)\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
@@ -90,14 +88,6 @@ return category_list\n
            <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>id</string> </key>
            <value> <string>ERP5Type_getSecurityCategoryFromMembershipCriterion</string> </value>