[Plone-cvs] r21329 - in plone.app.layout: branches/1.1/docs branches/1.1/plone/app/layout/viewlets trunk/docs trunk/plone/app/layout/viewlets

[Erik R. <svn...@pl...>]

Author: erikrose
Date: Mon Jun 30 20:39:04 2008
New Revision: 21329

Modified:
   plone.app.layout/branches/1.1/docs/HISTORY.txt
   plone.app.layout/branches/1.1/plone/app/layout/viewlets/common.py
   plone.app.layout/trunk/docs/HISTORY.txt
   plone.app.layout/trunk/plone/app/layout/viewlets/common.py
Log:
Made PersonalBarViewlet tolerate users who don't have a Plone user object, as when using OpenID or apachepas. Fixes #7712.


Modified: plone.app.layout/branches/1.1/docs/HISTORY.txt
==============================================================================
--- plone.app.layout/branches/1.1/docs/HISTORY.txt	(original)
+++ plone.app.layout/branches/1.1/docs/HISTORY.txt	Mon Jun 30 20:39:04 2008
@@ -4,6 +4,11 @@
 1.1.1 - Unreleased
 ------------------
 
+- Made PersonalBarViewlet tolerate users who don't have a Plone user object, as
+  when using OpenID or apachepas. This fixes
+  http://dev.plone.org/plone/ticket/7712.
+  [erikrose]
+
 - Use 'index' attribute rather than 'render' for setting viewlet templates, so that
   they can be overridden using the 'template' ZCML attribute.
   [davisagli]

Modified: plone.app.layout/branches/1.1/plone/app/layout/viewlets/common.py
==============================================================================
--- plone.app.layout/branches/1.1/plone/app/layout/viewlets/common.py	(original)
+++ plone.app.layout/branches/1.1/plone/app/layout/viewlets/common.py	Mon Jun 30 20:39:04 2008
@@ -185,7 +185,12 @@
                 self.homelink_url = self.site_url + '/author/' + quote_plus(userid)
             
             member_info = tools.membership().getMemberInfo(member.getId())
-            fullname = member_info.get('fullname', '')
+            # member_info is None if there's no Plone user object, as when
+            # using OpenID.
+            if member_info:
+                fullname = member_info.get('fullname', '')
+            else:
+                fullname = None
             if fullname:
                 self.user_name = fullname
             else:

Modified: plone.app.layout/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.layout/trunk/docs/HISTORY.txt	(original)
+++ plone.app.layout/trunk/docs/HISTORY.txt	Mon Jun 30 20:39:04 2008
@@ -17,6 +17,11 @@
 1.1.1 - Unreleased
 ------------------
 
+- Made PersonalBarViewlet tolerate users who don't have a Plone user object, as
+  when using OpenID or apachepas. This fixes
+  http://dev.plone.org/plone/ticket/7712.
+  [erikrose]
+
 - Use 'index' attribute rather than 'render' for setting viewlet templates, so
   that they can be overridden using the 'template' ZCML attribute.
   [davisagli]

Modified: plone.app.layout/trunk/plone/app/layout/viewlets/common.py
==============================================================================
--- plone.app.layout/trunk/plone/app/layout/viewlets/common.py	(original)
+++ plone.app.layout/trunk/plone/app/layout/viewlets/common.py	Mon Jun 30 20:39:04 2008
@@ -209,7 +209,12 @@
                 self.homelink_url = self.site_url + '/author/' + quote_plus(userid)
             
             member_info = tools.membership().getMemberInfo(member.getId())
-            fullname = member_info.get('fullname', '')
+            # member_info is None if there's no Plone user object, as when
+            # using OpenID.
+            if member_info:
+                fullname = member_info.get('fullname', '')
+            else:
+                fullname = None
             if fullname:
                 self.user_name = fullname
             else: