[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - tweaking

[Yvo Schubbe]

Log message for revision 127683:
  - tweaking

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2012-09-04 10:15:27 UTC (rev 127682)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2012-09-04 10:33:18 UTC (rev 127683)
@@ -303,7 +303,13 @@
         self.status = _(u'Your password has been mailed to you.')
         return self._setRedirect('portal_actions', 'user/login')
 
+    @property
+    @memoize
+    def admin_email(self):
+        ptool = getUtility(IPropertiesTool)
+        return ptool.getProperty('email_from_address')
 
+
 class LogoutView(ViewBase):
 
     """Log the user out"""

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt	2012-09-04 10:15:27 UTC (rev 127682)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt	2012-09-04 10:33:18 UTC (rev 127683)
@@ -7,9 +7,8 @@
 <p i18n:translate="">If this will not work for you (for example, if you forget
  your member ID or didn't enter your email address) send email to
  <a href="mailto:me at example.org"
-    tal:define="ptool context/portal_properties"
-    tal:attributes="href string:mailto:${ptool/email_from_address}"
-    tal:content="ptool/email_from_address"
+    tal:attributes="href string:mailto:${view/admin_email}"
+    tal:content="view/admin_email"
     i18n:name="admin_email">me at example.org</a>.</p>
 
 </metal:slot>