[Checkins] SVN: Products.CMFCore/branches/2.1/Products/CMFCore/ merge 105095 from trunk. Restore PropertyManager behaviour of DirectoryViewSurrogate

Leonardo Rochael Almeida leorochael at gmail.com
Sat Oct 17 18:58:43 EDT 2009


Log message for revision 105118:
  merge 105095 from trunk. Restore PropertyManager behaviour of DirectoryViewSurrogate

Changed:
  U   Products.CMFCore/branches/2.1/Products/CMFCore/DirectoryView.py
  U   Products.CMFCore/branches/2.1/Products/CMFCore/tests/test_DirectoryView.py

-=-
Modified: Products.CMFCore/branches/2.1/Products/CMFCore/DirectoryView.py
===================================================================
--- Products.CMFCore/branches/2.1/Products/CMFCore/DirectoryView.py	2009-10-17 10:29:22 UTC (rev 105117)
+++ Products.CMFCore/branches/2.1/Products/CMFCore/DirectoryView.py	2009-10-17 22:58:43 UTC (rev 105118)
@@ -469,7 +469,6 @@
 
     meta_type = 'Filesystem Directory View'
     _dirpath = None
-    _properties = None
     _objects = ()
 
     def __init__(self, id, reg_key='', fullname=None, properties=None):
@@ -480,7 +479,6 @@
 
         self.id = id
         self._dirpath = reg_key
-        self._properties = properties
 
     def __of__(self, parent):
         reg_key = self._dirpath

Modified: Products.CMFCore/branches/2.1/Products/CMFCore/tests/test_DirectoryView.py
===================================================================
--- Products.CMFCore/branches/2.1/Products/CMFCore/tests/test_DirectoryView.py	2009-10-17 10:29:22 UTC (rev 105117)
+++ Products.CMFCore/branches/2.1/Products/CMFCore/tests/test_DirectoryView.py	2009-10-17 22:58:43 UTC (rev 105118)
@@ -264,6 +264,12 @@
         testfolder = self.ob.fake_skin.test_directory
         self.assertEqual(testfolder.title, 'test_directory Title')
 
+    def test_DirectoryViewMetadataOnPropertyManager(self):
+        # Test to determine if metadata shows up correctly on a
+        # FSDV that has a corresponding .metadata file
+        testfolder = self.ob.fake_skin.test_directory
+        self.assertEqual(testfolder.getProperty('title'), 'test_directory Title')
+
     def test_DirectoryViewFolderDefault(self):
         # Test that a folder inside the fake skin really is of type
         # DirectoryViewSurrogate



More information about the checkins mailing list