[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Forward-port CMFDefault portion of fix for LP #299058.
Tres Seaver
tseaver at palladion.com
Tue Nov 18 13:18:13 EST 2008
Log message for revision 93095:
Forward-port CMFDefault portion of fix for LP #299058.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/permalink.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2008-11-18 18:17:17 UTC (rev 93094)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2008-11-18 18:18:13 UTC (rev 93095)
@@ -4,6 +4,9 @@
2.2.0 (unreleased)
------------------
+- skins/zpt_generic/permalink.py: fix typos, wrap object correctly.
+ See: https://bugs.launchpad.net/bugs/299058 .
+
- upgrade: Added basic upgrade steps.
So far they just allow to add and upgrade the root site manager.
@@ -78,7 +81,6 @@
- interfaces: Removed deprecated oldstyle interfaces.
-
2.1.2-beta (2008-08-26)
------------------
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/permalink.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/permalink.py 2008-11-18 18:17:17 UTC (rev 93094)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/permalink.py 2008-11-18 18:18:13 UTC (rev 93095)
@@ -10,7 +10,7 @@
from Products.CMFCore.utils import getUtilityByInterfaceName
subpath = traverse_subpath[0]
-uid_handler=getUtilityByInterfaceName('Products.CMFUid.interfaces.UniqueIDHandler')
+uid_handler=getUtilityByInterfaceName('Products.CMFUid.interfaces.IUniqueIdHandler')
# appending 'isAvailable' instead of a unique id returns if
# the site permalink feature is available.
@@ -23,9 +23,11 @@
return str(int(isAvailable))
obj = uid_handler.getObject(subpath)
+# workarround for an acquisition wrapping problem.
+obj = context.restrictedTraverse(obj.getPhysicalPath())
ti = obj.getTypeInfo()
-method_id = ti and ti.queryMethodID('view', context=self)
+method_id = ti and ti.queryMethodID('view', context=obj)
if method_id:
return getattr(obj, method_id)()
return obj()
More information about the Checkins
mailing list