[Plone-cvs] r34428 - in plone.app.layout/branches/1.2: . docs plone/app/layout/icons plone/app/layout/icons/tests plone/app/layout/viewlets

[David G. <svn...@pl...>]

Author: davisagli
Date: Mon Mar  1 08:18:09 2010
New Revision: 34428

Modified:
   plone.app.layout/branches/1.2/   (props changed)
   plone.app.layout/branches/1.2/docs/HISTORY.txt
   plone.app.layout/branches/1.2/plone/app/layout/icons/icons.py
   plone.app.layout/branches/1.2/plone/app/layout/icons/tests/test_icons.py
   plone.app.layout/branches/1.2/plone/app/layout/viewlets/content_history.pt   (props changed)
Log:
merge r34424 and r34425 from trunk

Modified: plone.app.layout/branches/1.2/docs/HISTORY.txt
==============================================================================
--- plone.app.layout/branches/1.2/docs/HISTORY.txt	(original)
+++ plone.app.layout/branches/1.2/docs/HISTORY.txt	Mon Mar  1 08:18:09 2010
@@ -4,6 +4,10 @@
 1.2.6 - unreleased
 ------------------
 
+- Make icon descriptions' lookup of portal_type title less brittle for
+  missing portal_types (fall back to the portal_type id).
+  [davisagli]
+
 - Do not let the homelink in the personal bar viewlet point to the
   author page but to the personalize_form (or dashboard).
   Fixes http://dev.plone.org/plone/ticket/8707

Modified: plone.app.layout/branches/1.2/plone/app/layout/icons/icons.py
==============================================================================
--- plone.app.layout/branches/1.2/plone/app/layout/icons/icons.py	(original)
+++ plone.app.layout/branches/1.2/plone/app/layout/icons/icons.py	Mon Mar  1 08:18:09 2010
@@ -50,12 +50,11 @@
     def description(self):
         context = aq_inner(self.context)
         tt = getToolByName(context, 'portal_types')
-        ttinfo = tt.get(self.brain['portal_type'], None)
-        #Fix problem with non existing portal_type #9401
-        if ttinfo: 
-            return ttinfo.Title()
+        fti = tt.get(self.brain['portal_type'])
+        if fti is not None:
+            return fti.Title()
         else:
-            return None
+            return self.brain['portal_type']
 
     @property
     def title(self):
@@ -83,7 +82,11 @@
     def description(self):
         context = aq_inner(self.context)
         tt = getToolByName(context, 'portal_types')
-        return tt.get(self.obj.portal_type).Title()
+        fti = tt.get(self.obj.portal_type)
+        if fti is not None:
+            return fti.Title()
+        else:
+            return self.obj.portal_type
 
     @property
     def title(self):

Modified: plone.app.layout/branches/1.2/plone/app/layout/icons/tests/test_icons.py
==============================================================================
--- plone.app.layout/branches/1.2/plone/app/layout/icons/tests/test_icons.py	(original)
+++ plone.app.layout/branches/1.2/plone/app/layout/icons/tests/test_icons.py	Mon Mar  1 08:18:09 2010
@@ -14,7 +14,7 @@
         icon = getMultiAdapter((self.folder.d1, self.app.REQUEST, brain))        
         self.loginAsPortalOwner()
         self.portal.portal_types.manage_renameObject('Document','FakeDocument')
-        self.assertEqual(icon.description, None)
+        self.assertEqual(icon.description, 'Document')
         self.portal.portal_types.manage_renameObject('FakeDocument','Document')
 
 def test_suite():