[Erp5-report] r45678 vincent - in /erp5/trunk/bt5/erp5_auto_logout: SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Apr 26 10:32:15 2011
New Revision: 45678

URL: http://svn.erp5.org?rev=45678&view=rev
Log:
Use tool-level preference accessor.

This simplifies code a lot, with added bonus of enabling use of highest-precedence System Preference.
Also, user_name is not used in the local cached function, so move it to cache key instead.

Modified:
    erp5/trunk/bt5/erp5_auto_logout/SkinTemplateItem/portal_skins/erp5_auto_logout/ERP5Site_getMaxUserInactivityDuration.xml
    erp5/trunk/bt5/erp5_auto_logout/bt/revision

Modified: erp5/trunk/bt5/erp5_auto_logout/SkinTemplateItem/portal_skins/erp5_auto_logout/ERP5Site_getMaxUserInactivityDuration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_auto_logout/SkinTemplateItem/portal_skins/erp5_auto_logout/ERP5Site_getMaxUserInactivityDuration.xml?rev=45678&r1=45677&r2=45678&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_auto_logout/SkinTemplateItem/portal_skins/erp5_auto_logout/ERP5Site_getMaxUserInactivityDuration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_auto_logout/SkinTemplateItem/portal_skins/erp5_auto_logout/ERP5Site_getMaxUserInactivityDuration.xml [utf8] Tue Apr 26 10:32:15 2011
@@ -51,28 +51,16 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>""" Get (in seconds) authentication expire interval for an user. """\n
-from zExceptions import Unauthorized\n
 from Products.ERP5Type.Cache import CachingMethod\n
 \n
-def getMaxUserInactivityDuration(user_name=None):\n
-  expire_interval = None\n
-  portal_preferences = context.portal_preferences\n
-  try:\n
-    active_preference = portal_preferences.getActivePreference()\n
-  except Unauthorized:\n
-    # when logging for first time through login_form user is still anonymous \n
-    # and so getActivePreference is not accessible. Try to get default preference\n
-    # for an ERP5 site \n
-    active_preference = getattr(portal_preferences, \'default_site_preference\', None)\n
-  if active_preference  is not None:\n
-    expire_interval = active_preference.getPreferredMaxUserInactivityDuration()\n
-  return expire_interval\n
+def getMaxUserInactivityDuration():\n
+  return context.portal_preferences.getPreferredMaxUserInactivityDuration()\n
 \n
 getMaxUserInactivityDuration = CachingMethod( \\\n
                                  getMaxUserInactivityDuration, \\\n
-                                 "ERP5Site_getMaxUserInactivityDuration", \\\n
+                                 "ERP5Site_getMaxUserInactivityDuration_%s" % (user_name, ), \\\n
                                  cache_factory=\'erp5_ui_medium\')\n
-return getMaxUserInactivityDuration(user_name)\n
+return getMaxUserInactivityDuration()\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_auto_logout/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_auto_logout/bt/revision?rev=45678&r1=45677&r2=45678&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_auto_logout/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_auto_logout/bt/revision [utf8] Tue Apr 26 10:32:15 2011
@@ -1 +1 @@
-9
\ No newline at end of file
+10
\ No newline at end of file