From: Helge T. <svn...@pl...> - 2009-04-29 09:11:03
|
Author: tesdal Date: Wed Apr 29 09:10:58 2009 New Revision: 26692 Modified: plone.app.contentrules/branches/1.1/docs/HISTORY.txt plone.app.contentrules/branches/1.1/plone/app/contentrules/conditions/portaltype.py plone.app.contentrules/branches/1.1/plone/app/contentrules/tests/test_condition_portal_type.py Log: Allow getTypeInfo to return None Modified: plone.app.contentrules/branches/1.1/docs/HISTORY.txt ============================================================================== --- plone.app.contentrules/branches/1.1/docs/HISTORY.txt (original) +++ plone.app.contentrules/branches/1.1/docs/HISTORY.txt Wed Apr 29 09:10:58 2009 @@ -4,6 +4,9 @@ plone.app.contentrules - 1.1.6 + - Add check to see if getTypeInfo can be None (which is a valid value) + [tesdal] + - Changed the simplepublish test to use a copy instead of a move action. The move action causes the content item to be moved away while editing it and causes a NotFound error. In Plone 3 this is hidden by the Modified: plone.app.contentrules/branches/1.1/plone/app/contentrules/conditions/portaltype.py ============================================================================== --- plone.app.contentrules/branches/1.1/plone/app/contentrules/conditions/portaltype.py (original) +++ plone.app.contentrules/branches/1.1/plone/app/contentrules/conditions/portaltype.py Wed Apr 29 09:10:58 2009 @@ -65,7 +65,10 @@ obj = aq_inner(self.event.object) if not hasattr(aq_base(obj), 'getTypeInfo'): return False - return obj.getTypeInfo().getId() in self.element.check_types + ti = obj.getTypeInfo() # getTypeInfo can be None + if ti is None: + return False + return ti.getId() in self.element.check_types class PortalTypeAddForm(AddForm): """An add form for portal type conditions. Modified: plone.app.contentrules/branches/1.1/plone/app/contentrules/tests/test_condition_portal_type.py ============================================================================== --- plone.app.contentrules/branches/1.1/plone/app/contentrules/tests/test_condition_portal_type.py (original) +++ plone.app.contentrules/branches/1.1/plone/app/contentrules/tests/test_condition_portal_type.py Wed Apr 29 09:10:58 2009 @@ -59,10 +59,15 @@ ex = getMultiAdapter((self.portal, e, DummyEvent(self.folder)), IExecutable) self.assertEquals(True, ex()) - + ex = getMultiAdapter((self.portal, e, DummyEvent(self.portal)), IExecutable) self.assertEquals(False, ex()) - + + self.folder.portal_types = None + ex = getMultiAdapter((self.portal, e, DummyEvent(self.folder)), IExecutable) + self.assertEquals(False, ex()) + + def test_suite(): from unittest import TestSuite, makeSuite suite = TestSuite() |
From: Wichert A. <wi...@wi...> - 2009-04-29 10:14:34
|
Hi Helge, Previously Helge Tesdal wrote: > Author: tesdal > Date: Wed Apr 29 09:10:58 2009 > New Revision: 26692 > > Modified: > plone.app.contentrules/branches/1.1/docs/HISTORY.txt > plone.app.contentrules/branches/1.1/plone/app/contentrules/conditions/portaltype.py > plone.app.contentrules/branches/1.1/plone/app/contentrules/tests/test_condition_portal_type.py > Log: > Allow getTypeInfo to return None can you merge this to trunk? Wichert. -- Wichert Akkerman <wi...@wi...> It is simple to make things. http://www.wiggy.net/ It is hard to make things simple. |