[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - set add_view_expr explicitly

[Yvo Schubbe]

Log message for revision 93131:
  - set add_view_expr explicitly

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/TypesTool.py	2008-11-19 11:57:38 UTC (rev 93130)
+++ Products.CMFCore/trunk/Products/CMFCore/TypesTool.py	2008-11-19 11:58:11 UTC (rev 93131)
@@ -16,7 +16,6 @@
 """
 
 import logging
-from urllib import quote
 from warnings import warn
 
 import Products
@@ -331,7 +330,7 @@
     def getInfoData(self):
         """ Get the data needed to create an ActionInfo.
         """
-        lazy_keys = ['url', 'available', 'allowed']
+        lazy_keys = ['available', 'allowed']
         lazy_map = {}
 
         lazy_map['id'] = self.getId()
@@ -340,9 +339,9 @@
         lazy_map['description'] = self.Description()
         if self.add_view_expr:
             lazy_map['url'] = self.add_view_expr_object
+            lazy_keys.append('url')
         else:
-            lazy_map['url'] = Expression('string:${folder_url}/++add++%s'
-                                         % quote(self.getId()))
+            lazy_map['url'] = ''
         if self.content_icon:
             lazy_map['icon'] = Expression('string:${portal_url}/%s'
                                           % self.content_icon)

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2008-11-19 11:57:38 UTC (rev 93130)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py	2008-11-19 11:58:11 UTC (rev 93131)
@@ -320,15 +320,13 @@
         self.assertEqual(info_data[0]['category'], 'folder/add')
         self.assertEqual(info_data[0]['title'], ti_data['title'])
         self.assertEqual(info_data[0]['description'], ti_data['description'])
-        self.assertEqual(info_data[0]['url'].text,
-                         'string:${folder_url}/++add++foo')
+        self.assertEqual(info_data[0]['url'], '')
         self.assertEqual(info_data[0]['icon'], '')
         self.assertEqual(info_data[0]['visible'], True)
         self.assertEqual(info_data[0]['available'], ti._checkAvailable)
         self.assertEqual(info_data[0]['allowed'], ti._checkAllowed)
 
-        self.assertEqual(set(info_data[1]),
-                         set(['url', 'available', 'allowed']))
+        self.assertEqual(set(info_data[1]), set(['available', 'allowed']))
 
     def _checkContentTI(self, ti):
         wanted_aliases = { 'view': 'dummy_view', '(Default)': 'dummy_view' }