[Checkins] SVN: Products.CMF - these properties are now always available
Yvo Schubbe
y.2011 at wcm-solutions.de
Thu Jul 28 10:00:41 EDT 2011
Log message for revision 122396:
- these properties are now always available
Changed:
U Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/logged_in.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py 2011-07-28 13:16:42 UTC (rev 122395)
+++ Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py 2011-07-28 14:00:41 UTC (rev 122396)
@@ -311,7 +311,7 @@
utool = getToolByName(self, 'portal_url')
member = mtool.getAuthenticatedMember()
if hasattr(aq_base(member), 'getProperty'):
- mskin = member.getProperty('portal_skin', None)
+ mskin = member.getProperty('portal_skin')
if mskin:
req = self.REQUEST
cookie = req.cookies.get(self.request_varname, None)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2011-07-28 13:16:42 UTC (rev 122395)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2011-07-28 14:00:41 UTC (rev 122396)
@@ -227,7 +227,7 @@
mtool.createMemberArea()
member = mtool.getAuthenticatedMember()
now = DateTime()
- last_login = member.getProperty('login_time', None)
+ last_login = member.getProperty('login_time')
never_logged_in = str(last_login).startswith('2000/01/01')
ptool = self._getTool('portal_properties')
if never_logged_in and ptool.getProperty('validate_email'):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/logged_in.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/logged_in.py 2011-07-28 13:16:42 UTC (rev 122395)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/logged_in.py 2011-07-28 14:00:41 UTC (rev 122396)
@@ -29,7 +29,7 @@
mtool.createMemberArea()
member = mtool.getAuthenticatedMember()
now = context.ZopeTime()
- last_login = member.getProperty('login_time', None)
+ last_login = member.getProperty('login_time')
never_logged_in = str(last_login).startswith('2000/01/01')
if never_logged_in and ptool.getProperty('validate_email'):
member.setProperties(last_login_time='1999/01/01', login_time=now)
More information about the checkins
mailing list