[Erp5-report] r19340 - in /erp5/trunk/products/ERP5Type: ./ dtml/

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Feb 15 19:46:10 2008
New Revision: 19340

URL: http://svn.erp5.org?rev=19340&view=rev
Log:
Remove default base category script.

Modified:
    erp5/trunk/products/ERP5Type/RoleInformation.py
    erp5/trunk/products/ERP5Type/dtml/editToolsRoles.dtml

Modified: erp5/trunk/products/ERP5Type/RoleInformation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/RoleInformation.py?rev=19340&r1=19339&r2=19340&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/RoleInformation.py (original)
+++ erp5/trunk/products/ERP5Type/RoleInformation.py Fri Feb 15 19:46:10 2008
@@ -25,8 +25,6 @@
 
 from Permissions import View
 
-ERP5TYPE_SECURITY_CATEGORY_GENERATION_SCRIPT = \
-                'ERP5Type_getSecurityCategoryFromAssignment'
 
 class RoleInformation( SimpleItem ):
 
@@ -134,10 +132,10 @@
 
         """ 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 ):

Modified: erp5/trunk/products/ERP5Type/dtml/editToolsRoles.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/dtml/editToolsRoles.dtml?rev=19340&r1=19339&r2=19340&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dtml/editToolsRoles.dtml (original)
+++ erp5/trunk/products/ERP5Type/dtml/editToolsRoles.dtml Fri Feb 15 19:46:10 2008
@@ -82,14 +82,19 @@
 
 <tr>
 <td></td>
-<td>
-  <div class="form-label">
-  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)">" />
+<td colspan="2"><strong>Local role name generation rule</strong></td>
+</tr>
+
+<tr>
+<td></td>
+<td>
+  <div class="form-label">
+    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)">" />
   </div>
 </td>
 </tr>
@@ -106,6 +111,12 @@
   <input type="text" name="base_category_script_&dtml-index;" value="&dtml-base_category_script;" size="80" />
   </div>
 </td>
+</tr>
+
+<tr>
+<td></td>
+<td>[<strong>OR</strong>]</td>
+<td></td>
 </tr>
 
 <tr>
@@ -209,6 +220,11 @@
 
 <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
@@ -233,6 +249,12 @@
   <input type="text" name="base_category_script" size="80" />
   </div>
 </td>
+</tr>
+
+<tr>
+<td></td>
+<td>[<strong>OR</strong>]</td>
+<td></td>
 </tr>
 
 <tr>