Changeset 48059

Timestamp:

08/07/06 14:27:12 (2 years ago)

Author:

gracinet

Message:

#1714: put l10n titles info in trees

Files:

• CPS3/products/CPSCore/trunk/CHANGES (modified) (1 diff)
• CPS3/products/CPSCore/trunk/TreesTool.py (modified) (2 diffs)
• CPS3/products/CPSCore/trunk/tests/test_treestool.py (modified) (2 diffs)

CPS3/products/CPSCore/trunk/CHANGES

@@ -9 +9 @@
-- Event Subscriber importer did not check properly prior existence, leading
-  to errors in trees tool when notification was made twice
+- #1714: put l10n titles info in trees
-New internal features:
-~~~~~~~~~~~~~~~~~~~~~~

CPS3/products/CPSCore/trunk/TreesTool.py

@@ -53 +53 @@
-from zope.app.container.interfaces import IContainerModifiedEvent
-from OFS.interfaces import IObjectWillBeMovedEvent
+from interfaces import ICPSProxy
-
-def intersects(a, b):
@@ -262 +263 @@
-            'portal_type': ob.portal_type,
-            })
+        if ICPSProxy.providedBy(ob):
+            info['l10_titles'] = ob.getL10nTitles()
-        info.update(self.getNodeSecurityInfo(ob))
-        return info

CPS3/products/CPSCore/trunk/tests/test_treestool.py

@@ -29 +29 @@
-from OFS.OrderedFolder import OrderedFolder
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
-
+, TreeCacheUpdater
-from Products.CPSCore.treemodification import ADD, REMOVE, MODIFY
-
@@ -497 +497 @@
-            'visible': False,
-            })
+
+    def test_getNodeInfo(self):
+        self.makeInfrastructure()
+        cmf = self.app.cmf
+        tool = cmf.portal_trees
+        cache = tool.cache
+        cache_upd = TreeCacheUpdater(cache)
+
+        # test on ordinary object
+        info = cache_upd.getNodeInfo(cmf.root.foo)
+        self.assertEquals(info,
+                          {'allowed_roles_and_users': ['Manager'],
+                           'title': 'Foo',
+                           'local_roles': {'user:Anonymous User': ('Owner',)},
+                           'rpath': 'root/foo',
+                           'portal_type': 'ThePortalType',
+                           'id': 'foo'})
+
+        # test on proxy
+        from Products.CPSCore.ProxyBase import ProxyFolder
+        cmf.root._setObject('bar', ProxyFolder('bar'))
+
+        class DummyObjectTitle(DummyObject):
+            # subclass was preferd to adding the method to DummyObject
+            # in order to be sure not to void tests of info_method system
+
+            def Title(self):
+                return self.title
+
+        cmf.root._setObject('bar_en', DummyObjectTitle('bar_en',
+                                                  title='English title'))
+        cmf.root._setObject('bar_fr', DummyObjectTitle('bar_fr',
+                                                  title='French title'))
+        cmf.root.bar.portal_type = cmf.root.bar_en.portal_type
+
+        # monkey patch of bar's getContent to avoid proxy and repo tool faking
+        def getContent(lang='default', **kw):
+            if lang in ['default', 'en']:
+                return cmf.root.bar_en
+            elif lang == 'fr':
+                return cmf.root.bar_fr
+
+        def getProxyLanguages():
+            return ['fr', 'en']
+
+        bar = cmf.root.bar
+        bar.getContent = getContent
+        bar.getProxyLanguages = getProxyLanguages
+
+        info = cache_upd.getNodeInfo(cmf.root.bar)
+        self.assertEquals(info, {'allowed_roles_and_users': ['Manager'],
+                                 'local_roles': {
+            'user:Anonymous User': ('Owner',)},
+                                 'title': 'English title',
+                                 'l10_titles': {'fr': 'French title',
+                                                'en': 'English title'},
+                                 'rpath': 'root/bar',
+                                 'portal_type': 'ThePortalType',
+                                 'id': 'bar'})
-
-    def makeDeepStructure(self):