Changeset 7175 for main/waeup.sirp/trunk/src/waeup

Timestamp:

23 Nov 2011, 07:19:16 (13 years ago)

Author:

Henrik Bettermann

Message:

Define get_user_account in helpers and use it.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/viewlets.py (modified) (3 diffs)
• utils/helpers.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -3 +3 @@
 import grok
 
-from zope.component import getMultiAdapter, queryAdapter, getUtility
+from zope.component import getMultiAdapter, queryAdapter
 from zope.interface import Interface
 from zope.location.interfaces import ISite
 from zope.traversing.browser import absoluteURL
-from zope.pluggableauth.interfaces import IAuthenticatorPlugin
 from waeup.sirp.browser.pages import (
     UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
@@ -17 +16 @@
                                    IWAeUPXMLImporter, IDataCenter)
 from waeup.sirp.browser.layout import WAeUPPage
+from waeup.sirp.utils.helpers import get_user_account
 
 grok.templatedir('templates')
@@ -339 +339 @@
     icon = ''
 
-    def getUserAccount(self):
-        """Return local user account.
-        """
-        principal_id = self.request.principal.id
-        authenticator = getUtility(IAuthenticatorPlugin, name='users')
-        account = authenticator.getAccount(principal_id)
-        return account
-
     @property
     def url(self):
-        account_object = self.getUserAccount()
+        account_object = get_user_account(self.request)
         if account_object:
-            return absoluteURL(account_object, self.request)
+            return self.view.url(account_object)
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py

@@ -8 +8 @@
 from cStringIO import StringIO
 from docutils.core import publish_string
+from zope.component import getUtility
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
@@ -14 +15 @@
 from zope.security.interfaces import NoInteraction
 from zope.security.management import getInteraction
+from zope.pluggableauth.interfaces import IAuthenticatorPlugin
 
 BUFSIZE = 8 * 1024
@@ -451 +453 @@
     file_like_obj.seek(0, 2) # seek to last position in file
     return file_like_obj.tell()
+
+def get_user_account(request):
+    """Return local user account.
+    """
+    principal_id = request.principal.id
+    authenticator = getUtility(IAuthenticatorPlugin, name='users')
+    account = authenticator.getAccount(principal_id)
+    return account
+