diff --git a/product/ERP5Type/RoleInformation.py b/product/ERP5Type/RoleInformation.py index 3944825e6092e25bdbc7ac4bbf5853b7e4a7c850..166cdc1e4058c14fd00c085260f6109e2b76bccf 100644 --- a/product/ERP5Type/RoleInformation.py +++ b/product/ERP5Type/RoleInformation.py @@ -25,8 +25,6 @@ from Products.CMFCore.Expression import Expression from Permissions import View -ERP5TYPE_SECURITY_CATEGORY_GENERATION_SCRIPT = \ - 'ERP5Type_getSecurityCategoryFromAssignment' class RoleInformation( SimpleItem ): @@ -134,10 +132,10 @@ class RoleInformation( SimpleItem ): """ Return the base_category_script id """ - base_category_script = getattr(self, 'base_category_script', '') - if base_category_script: + base_category_script = getattr(self, 'base_category_script', None) + if base_category_script is not None: return base_category_script - return ERP5TYPE_SECURITY_CATEGORY_GENERATION_SCRIPT + return '' security.declarePrivate( 'clone' ) def clone( self ): diff --git a/product/ERP5Type/dtml/editToolsRoles.dtml b/product/ERP5Type/dtml/editToolsRoles.dtml index f7a3a16cbb82bf9009d6b3a88e3d82fbd153e0d0..b09fd7f6a9d44219be2d4afc163c5d9794c345d9 100644 --- a/product/ERP5Type/dtml/editToolsRoles.dtml +++ b/product/ERP5Type/dtml/editToolsRoles.dtml @@ -80,16 +80,21 @@ </td> </tr> +<tr> +<td></td> +<td colspan="2"><strong>Local role name generation rule</strong></td> +</tr> + <tr> <td></td> <td> <div class="form-label"> - Base Category + Base Category </div> </td> <td> <div class="form-element"> - <input type="text" size="40" name="base_category_&dtml-index;" value="<dtml-var "' '.join(base_category)">" /> + <input type="text" size="40" name="base_category_&dtml-index;" value="<dtml-var "' '.join(base_category)">" /> </div> </td> </tr> @@ -108,6 +113,12 @@ </td> </tr> +<tr> +<td></td> +<td>[<strong>OR</strong>]</td> +<td></td> +</tr> + <tr> <td></td> <td> @@ -207,6 +218,11 @@ Add a role </td> </tr> +<tr> +<td></td> +<td colspan="2"><strong>Local role name generation rule</strong></td> +</tr> + <tr> <td></td> <td> @@ -235,6 +251,12 @@ Add a role </td> </tr> +<tr> +<td></td> +<td>[<strong>OR</strong>]</td> +<td></td> +</tr> + <tr> <td></td> <td>