[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - moved 'link_target' property up to the related 'url_expr'

[Yvo Schubbe]

Log message for revision 105897:
  - moved 'link_target' property up to the related 'url_expr'

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py
  U   Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py	2009-11-20 07:40:58 UTC (rev 105896)
+++ Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py	2009-11-20 07:57:56 UTC (rev 105897)
@@ -87,14 +87,14 @@
          'label':'I18n Domain'},
         {'id': 'url_expr', 'type': 'string', 'mode': 'w',
          'label': 'URL (Expression)'},
+        {'id':'link_target', 'type': 'string', 'mode':'w',
+         'label':'Link Target'},
         {'id': 'icon_expr', 'type': 'string', 'mode': 'w',
          'label': 'Icon (Expression)'},
         {'id': 'available_expr', 'type': 'string', 'mode': 'w',
          'label': 'Condition (Expression)'},
         {'id': 'permissions', 'type': 'multiple selection', 'mode': 'w',
          'label': 'Permissions', 'select_variable': 'possible_permissions'},
-        {'id':'link_target', 'type': 'string', 'mode':'w',
-         'label':'Link Target'},
         {'id': 'visible', 'type': 'boolean', 'mode': 'w',
          'label': 'Visible?'},
         )
@@ -109,10 +109,10 @@
         self._setPropValue( 'description', kw.get('description', '') )
         self._setPropValue( 'i18n_domain', kw.get('i18n_domain', '') )
         self._setPropValue( 'url_expr', kw.get('url_expr', '') )
+        self._setPropValue( 'link_target', kw.get('link_target', '') )
         self._setPropValue( 'icon_expr', kw.get('icon_expr', '') )
         self._setPropValue( 'available_expr', kw.get('available_expr', '') )
         self._setPropValue( 'permissions', kw.get('permissions', () ) )
-        self._setPropValue( 'link_target', kw.get('link_target', '') )
         self._setPropValue( 'visible', kw.get('visible', True) )
 
     def _setPropValue(self, id, value):
@@ -177,11 +177,11 @@
                 self.data.setdefault( 'title', self.data['name'] )
                 del self.data['name']
             self.data.setdefault( 'url', '' )
+            self.data.setdefault( 'link_target', '' )
             self.data.setdefault( 'icon', '' )
             self.data.setdefault( 'category', 'object' )
             self.data.setdefault( 'visible', True )
             self.data['available'] = True
-            self.data.setdefault('link_target', '')
         else:
             # if action isn't a dict, it has to implement IAction
             (lazy_map, lazy_keys) = action.getInfoData()

Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py	2009-11-20 07:40:58 UTC (rev 105896)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py	2009-11-20 07:57:56 UTC (rev 105897)
@@ -22,7 +22,6 @@
 from Acquisition import Implicit
 from OFS.OrderedFolder import OrderedFolder
 from zope.interface import implements
-from zope.interface import Interface
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.interfaces import IActionProvider
@@ -40,10 +39,10 @@
  <property name="title">Foo</property>
  <property name="description"></property>
  <property name="url_expr">string:${object_url}/foo</property>
+ <property name="link_target"></property>
  <property name="icon_expr"></property>
  <property name="available_expr">python:1</property>
  <property name="permissions"/>
- <property name="link_target"></property>
  <property name="visible">True</property>
 </object>
 """
@@ -55,10 +54,10 @@
   <property name="title"></property>
   <property name="description"></property>
   <property name="url_expr"></property>
+  <property name="link_target"></property>
   <property name="icon_expr"></property>
   <property name="available_expr"></property>
   <property name="permissions"/>
-  <property name="link_target"></property>
   <property name="visible">True</property>
  </object>
 </object>
@@ -75,10 +74,10 @@
    <property name="title" i18n:translate=""></property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr"></property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions"/>
-   <property name="link_target"></property>
    <property name="visible">True</property>
   </object>
  </object>
@@ -156,10 +155,10 @@
    <property name="title">Baz</property>
    <property name="description"></property>
    <property name="url_expr">string:${object_url}/baz</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">python:1</property>
    <property name="permissions"></property>
-   <property name="link_target"></property>
    <property name="visible">True</property>
   </object>
  </object>
@@ -177,10 +176,10 @@
    <property name="title" i18n:translate="">Foo</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${object_url}/foo</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">python:1</property>
    <property name="permissions"></property>
-   <property name="link_target"></property>
    <property name="visible">True</property>
   </object>
  </object>