[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/ Test for user being logged in actually tested for the anonymous user. This has been changed to make the behaviour more logical.

Charlie Clark charlie at begeistert.org
Thu Jun 24 10:10:53 EDT 2010


Log message for revision 113795:
  Test for user being logged in actually tested for the anonymous user. This has been changed to make the behaviour more logical.

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/templates/logged_out.pt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py	2010-06-24 09:38:46 UTC (rev 113794)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/authentication.py	2010-06-24 14:10:52 UTC (rev 113795)
@@ -254,7 +254,7 @@
     def logged_in(self):
         """Check whether the user is (still logged in)"""
         mtool = self._getTool('portal_membership')
-        return mtool.isAnonymousUser()
+        return not mtool.isAnonymousUser()
         
     @memoize
     def logout(self):
@@ -269,7 +269,7 @@
     
     def __call__(self):
         """Clear cookies and return the template"""
-        if not self.logged_in():
+        if self.logged_in():
             self.clear_skin_cookie()
             self.logout()
             return self.request.response.redirect(self.request.URL)

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/templates/logged_out.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/templates/logged_out.pt	2010-06-24 09:38:46 UTC (rev 113794)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/templates/logged_out.pt	2010-06-24 14:10:52 UTC (rev 113795)
@@ -2,9 +2,9 @@
 <body>
 
 <metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<p tal:condition="not: view/logged_in"
+   i18n:translate="">You have been logged out.</p>
 <p tal:condition="view/logged_in"
-   i18n:translate="">You have been logged out.</p>
-<p tal:condition="not: view/logged_in"
    i18n:translate="">You are logged in outside the portal. You may need to
 <a href="/manage_zmi_logout">log out of the Zope management interface</a>.</p>
 </metal:slot>



More information about the checkins mailing list