[Checkins] SVN: Sandbox/nadako/zope.browserresource/ When publishing a resource via Resources view, set resource parent to an ISite object, not to current site manager.
Dan Korostelev
nadako at gmail.com
Sat Aug 22 16:49:28 EDT 2009
Log message for revision 103093:
When publishing a resource via Resources view, set resource parent to an ISite object, not to current site manager.
Note additional changes in the CHANGES.txt.
Changed:
U Sandbox/nadako/zope.browserresource/CHANGES.txt
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/resources.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py
-=-
Modified: Sandbox/nadako/zope.browserresource/CHANGES.txt
===================================================================
--- Sandbox/nadako/zope.browserresource/CHANGES.txt 2009-08-22 20:17:09 UTC (rev 103092)
+++ Sandbox/nadako/zope.browserresource/CHANGES.txt 2009-08-22 20:49:27 UTC (rev 103093)
@@ -7,3 +7,12 @@
Initial release. This package was splitted off zope.app.publisher as a part
of refactoring process.
+
+Additional changes that are made during refactoring:
+
+ * Fix a regular expression that were used for icon titles when titles
+ are not specified in the icon directive. It does strip the "I" from
+ the interface name as intended.
+
+ * When publishing a resource via Resources view, set resource parent
+ to an ISite object, not to current site manager.
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/resources.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/resources.py 2009-08-22 20:17:09 UTC (rev 103092)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/resources.py 2009-08-22 20:49:27 UTC (rev 103093)
@@ -35,8 +35,7 @@
if resource is None:
raise NotFound(self, name)
- sm = zope.component.getSiteManager()
- locate(resource, sm, name)
+ locate(resource, self.context, name)
return resource
def browserDefault(self, request):
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py 2009-08-22 20:17:09 UTC (rev 103092)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py 2009-08-22 20:49:27 UTC (rev 103093)
@@ -41,9 +41,12 @@
def __init__(self, request): pass
def __call__(self): return 42
+ site = object()
provideAdapter(Resource, (IDefaultBrowserLayer,), Interface, 'test')
- view = Resources(None, request)
+ view = Resources(site, request)
resource = view.publishTraverse(request, 'test')
+ self.assertTrue(resource.__parent__ is site)
+ self.assertEqual(resource.__name__, 'test')
self.assertEqual(resource(), 42)
def test_getitem(self):
More information about the Checkins
mailing list