Commit 085a8dee authored by Yusei Tahara's avatar Yusei Tahara

Remove default base category script.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19340 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2debd3de
...@@ -25,8 +25,6 @@ from Products.CMFCore.Expression import Expression ...@@ -25,8 +25,6 @@ from Products.CMFCore.Expression import Expression
from Permissions import View from Permissions import View
ERP5TYPE_SECURITY_CATEGORY_GENERATION_SCRIPT = \
'ERP5Type_getSecurityCategoryFromAssignment'
class RoleInformation( SimpleItem ): class RoleInformation( SimpleItem ):
...@@ -134,10 +132,10 @@ class RoleInformation( SimpleItem ): ...@@ -134,10 +132,10 @@ class RoleInformation( SimpleItem ):
""" Return the base_category_script id """ Return the base_category_script id
""" """
base_category_script = getattr(self, 'base_category_script', '') base_category_script = getattr(self, 'base_category_script', None)
if base_category_script: if base_category_script is not None:
return base_category_script return base_category_script
return ERP5TYPE_SECURITY_CATEGORY_GENERATION_SCRIPT return ''
security.declarePrivate( 'clone' ) security.declarePrivate( 'clone' )
def clone( self ): def clone( self ):
......
...@@ -80,16 +80,21 @@ ...@@ -80,16 +80,21 @@
</td> </td>
</tr> </tr>
<tr>
<td></td>
<td colspan="2"><strong>Local role name generation rule</strong></td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td> <td>
<div class="form-label"> <div class="form-label">
Base Category Base Category
</div> </div>
</td> </td>
<td> <td>
<div class="form-element"> <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> </div>
</td> </td>
</tr> </tr>
...@@ -108,6 +113,12 @@ ...@@ -108,6 +113,12 @@
</td> </td>
</tr> </tr>
<tr>
<td></td>
<td>[<strong>OR</strong>]</td>
<td></td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td> <td>
...@@ -207,6 +218,11 @@ Add a role ...@@ -207,6 +218,11 @@ Add a role
</td> </td>
</tr> </tr>
<tr>
<td></td>
<td colspan="2"><strong>Local role name generation rule</strong></td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td> <td>
...@@ -235,6 +251,12 @@ Add a role ...@@ -235,6 +251,12 @@ Add a role
</td> </td>
</tr> </tr>
<tr>
<td></td>
<td>[<strong>OR</strong>]</td>
<td></td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td> <td>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment