[Erp5-report] r38881 seb - in /erp5/trunk/products/ERP5Type: dtml/ patches/

[nobody at svn.erp5.org]

Author: seb
Date: Tue Oct  5 11:09:54 2010
New Revision: 38881

URL: http://svn.erp5.org?rev=38881&view=rev
Log:
adapt action patches to zope 2.12 and newer version
of CMFCore

Modified:
    erp5/trunk/products/ERP5Type/dtml/editToolsActions.dtml
    erp5/trunk/products/ERP5Type/patches/ActionProviderBase.py

Modified: erp5/trunk/products/ERP5Type/dtml/editToolsActions.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/dtml/editToolsActions.dtml?rev=38881&r1=38880&r2=38881&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dtml/editToolsActions.dtml [utf8] (original)
+++ erp5/trunk/products/ERP5Type/dtml/editToolsActions.dtml [utf8] Tue Oct  5 11:09:54 2010
@@ -33,7 +33,7 @@
 </td>
 <td>
   <div class="form-element">
-  <input type="text" name="name_&dtml-index;" value="&dtml-name;" />
+  <input type="text" name="title_&dtml-index;" value="&dtml-title;" />
   </div>
 </td>
 </tr>
@@ -118,11 +118,11 @@
 <td>
   <div class="form-element">
   <select name="permission_&dtml-index;">
-    <dtml-let selected="(not permission) and 'selected' or ' '">
+    <dtml-let selected="(not permissions) and 'selected' or ' '">
       <option value="" &dtml-selected;>(none)</option>
     </dtml-let>
     <dtml-in possible_permissions sort>
-      <dtml-let selected="(permission == _['sequence-item'])
+      <dtml-let selected="(permissions and permissions[0] == _['sequence-item'])
         and 'selected' or ' '">
       <option value="&dtml-sequence-item;" &dtml-selected;>&dtml-sequence-item;</option>
       </dtml-let>
@@ -216,7 +216,7 @@ Add an action
 </td>
 <td>
   <div class="form-element">
-  <input type="text" name="name" value="" />
+  <input type="text" name="title" value="" />
   </div>
 </td>
 </tr>

Modified: erp5/trunk/products/ERP5Type/patches/ActionProviderBase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/ActionProviderBase.py?rev=38881&r1=38880&r2=38881&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/ActionProviderBase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/ActionProviderBase.py [utf8] Tue Oct  5 11:09:54 2010
@@ -60,7 +60,7 @@ def ActionProviderBase_manage_editAction
 
 def ActionProviderBase_addAction( self
               , id
-              , name
+              , title
               , action
               , condition
               , permission
@@ -73,8 +73,8 @@ def ActionProviderBase_addAction( self
               ):
     """ Add an action to our list.
     """
-    if not name:
-        raise ValueError('A name is required.')
+    if not title:
+        raise ValueError('A title is required.')
 
     a_expr = action and Expression(text=str(action)) or ''
     i_expr = icon and Expression(text=str(icon)) or ''
@@ -86,7 +86,7 @@ def ActionProviderBase_addAction( self
     new_actions = self._cloneActions()
 
     new_action = ActionInformation( id=str(id)
-                                  , title=str(name)
+                                  , title=str(title)
                                   , description=str(description)
                                   , action=a_expr
                                   , icon=i_expr
@@ -110,7 +110,7 @@ def ActionProviderBase_extractAction( se
     """ Extract an ActionInformation from the funky form properties.
     """
     id          = str( properties.get( 'id_%d'          % index, '' ) )
-    name        = str( properties.get( 'name_%d'        % index, '' ) )
+    title        = str( properties.get( 'title_%d'        % index, '' ) )
     description = str( properties.get( 'description_%d'        % index, '' ) )
     action      = str( properties.get( 'action_%d'      % index, '' ) )
     icon        = str( properties.get( 'icon_%d'        % index, '' ) )
@@ -120,8 +120,8 @@ def ActionProviderBase_extractAction( se
     permissions =      properties.get( 'permission_%d'  % index, () )
     priority    = float( properties.get( 'priority_%d'    % index, 1.0 ))
 
-    if not name:
-        raise ValueError('A name is required.')
+    if not title:
+        raise ValueError('A title is required.')
 
     if action is not '':
         action = Expression( text=action )
@@ -148,7 +148,7 @@ def ActionProviderBase_extractAction( se
         priority = float(priority)
 
     return ActionInformation( id=id
-                            , title=name
+                            , title=title
                             , description=description
                             , action=action
                             , icon=icon