[Erp5-report] r27319 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jm
Date: Mon Jun  1 17:40:02 2009
New Revision: 27319

URL: http://svn.erp5.org?rev=27319&view=rev
Log:
Except for persons, always try to use 'codification' property first in order to compute security group.
Indeed, this property was created for that purpose, as written in Codification property sheet:
« Codification is an identifier used by security groups »

'reference' property is used if no codification is set.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml?rev=27319&r1=27318&r2=27319&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Type_asSecurityGroupId.xml [utf8] Mon Jun  1 17:40:02 2009
@@ -126,10 +126,9 @@
         user_name = category_object.getReference()\n
         if user_name is not None: user_list.append(user_name)\n
       else:\n
-        if portal_type == \'Category\':\n
-          category_code = category_object.getCodification() or category_object.getId()\n
-        else:\n
-          category_code = category_object.getProperty(\'reference\') or category_object.getId()\n
+        category_code = (category_object.getProperty(\'codification\') or\n
+                         category_object.getProperty(\'reference\') or\n
+                         category_object.getId())\n
         if is_child_category: category_code += \'*\'\n
         associative_list.append(category_code)\n
     # Prevent making a cartesian product with an empty set\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=27319&r1=27318&r2=27319&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Jun  1 17:40:02 2009
@@ -1,1 +1,1 @@
-1212
+1213