Changeset 7177

Timestamp:

23 Nov 2011, 09:18:19 (13 years ago)

Author:

Henrik Bettermann

Message:

Role back some changes made earlier: global and local role strings with html tags should be better constructed in view not in permission module.

Rename some role related methods to avoid (my) confusion.

Location:

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

Files:

• authentication.py (modified) (3 diffs)
• authentication.txt (modified) (1 diff)
• browser/layout.py (modified) (1 diff)
• browser/pages.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• permissions.py (modified) (5 diffs)
• permissions.txt (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

@@ -76 +76 @@
         self.description = description
         self.setPassword(password)
-        self.setRoles(roles)
+        #self.setSiteRolesForPrincipal(roles)
         # We don't want to share this dict with other accounts
         self._local_roles = dict()
@@ -88 +88 @@
         return passwordmanager.checkPassword(self.password, password)
 
-    def getRoles(self):
+    def getSiteRolesForPrincipal(self):
         prm = get_principal_role_manager()
         roles = [x[0] for x in prm.getRolesForPrincipal(self.name)
@@ -94 +94 @@
         return roles
 
-    def setRoles(self, roles):
+    def setSiteRolesForPrincipal(self, roles):
         prm = get_principal_role_manager()
-
-        old_roles = self.getRoles()
+        old_roles = self.getSiteRolesForPrincipal()
         for role in old_roles:
             # Remove old roles, not to be set now...
             if role.startswith('waeup.') and role not in roles:
                 prm.unsetRoleForPrincipal(role, self.name)
-
         for role in roles:
             prm.assignRoleToPrincipal(role, self.name)
 
-    roles = property(getRoles, setRoles)
+    roles = property(getSiteRolesForPrincipal, setSiteRolesForPrincipal)
 
     def getLocalRoles(self):

main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt

@@ -53 +53 @@
 Users have also got the global PortalUser role:
 
-  >>> alice.getRoles()
+  >>> alice.getSiteRolesForPrincipal()
   ['waeup.PortalUser']
 

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

@@ -16 +16 @@
 from waeup.sirp.students.interfaces import IStudentNavigation
 from waeup.sirp.authentication import get_principal_role_manager
-from waeup.sirp.permissions import getRoles
 
 grok.templatedir('templates')

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

@@ -37 +37 @@
     ISessionConfiguration, ISessionConfigurationAdd, academic_sessions_vocab,
     IPasswordValidator)
-from waeup.sirp.permissions import (
-    get_users_with_local_roles,
-    getGlobalRolesForAccount, getLocalRolesForAccount)
+from waeup.sirp.permissions import get_users_with_local_roles, getAllRoles
 from waeup.sirp.university.catalog import search
 from waeup.sirp.university.vocabularies import course_levels
@@ -263 +261 @@
 
     def getLocalRoles(self, account):
-        return getLocalRolesForAccount(self, account)
+        local_roles = account.getLocalRoles()
+        local_roles_string = ''
+        site_url = self.url(grok.getSite())
+        for local_role in local_roles.keys():
+            role_title = dict(getAllRoles())[local_role].title
+            objects_string = ''
+            for object in local_roles[local_role]:
+                objects_string += '<a href="%s">%s</a>, ' %(self.url(object),
+                    self.url(object).replace(site_url,''))
+            local_roles_string += '%s: <br />%s <br />' %(role_title,
+                objects_string.rstrip(', '))
+        return local_roles_string
 
     def getGlobalRoles(self, account):
-        return getGlobalRolesForAccount(account)
+        global_roles = account.roles
+        global_roles_string = ''
+        for global_role in global_roles:
+            role_title = dict(getAllRoles())[global_role].title
+            global_roles_string += '%s <br />' % role_title
+        return global_roles_string
 
 class AddUserFormPage(WAeUPAddFormPage):

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -86 +86 @@
     def getTitle(self, value):
         # late import: in interfaces we should not import local modules
-        from waeup.sirp.permissions import getRoles
-        roles = dict(getRoles())
+        from waeup.sirp.permissions import getAllRoles
+        roles = dict(getAllRoles())
         if value in roles.keys():
             title = roles[value].title

main/waeup.sirp/trunk/src/waeup/sirp/permissions.py

@@ -85 +85 @@
                      'waeup.viewHostels', 'waeup.manageHostels')
 
-def getRoles():
+def getAllRoles():
     """Return a list of tuples ``<ROLE-NAME>, <ROLE>``.
     """
@@ -102 +102 @@
     Returns a generator of the found roles.
     """
-    for name, item in getRoles():
+    for name, item in getAllRoles():
         if not name.startswith('waeup.'):
             # Ignore non-WAeUP roles...
@@ -120 +120 @@
     return sorted([x.id for x in getWAeUPRoles()])
 
-def getLocalRolesForAccount(view, account):
-    """Return HTML tagged string with all local roles of a user account.
-    """
-    local_roles = account.getLocalRoles()
-    local_roles_string = ''
-    site_url = view.url(grok.getSite())
-    for local_role in local_roles.keys():
-        role_title = dict(getRoles())[local_role].title
-        objects_string = ''
-        for object in local_roles[local_role]:
-            objects_string += '<a href="%s">%s</a>, ' %(view.url(object),
-                view.url(object).replace(site_url,''))
-        local_roles_string += '%s: <br />%s <br />' %(role_title,
-            objects_string.rstrip(', '))
-    return local_roles_string
-
-def getGlobalRolesForAccount(account):
-    """Return HTML tagged string with all global roles of a user account.
-    """
-    global_roles = account.roles
-    global_roles_string = ''
-    for global_role in global_roles:
-        role_title = dict(getRoles())[global_role].title
-        global_roles_string += '%s <br />' % role_title
-    return global_roles_string
+#def getLocalRolesForAccount(view, account):
+#    """Return HTML tagged string with all local roles of a user account.
+#    """
+#    local_roles = account.getLocalRoles()
+#    local_roles_string = ''
+#    site_url = view.url(grok.getSite())
+#    for local_role in local_roles.keys():
+#        role_title = dict(getAllRoles())[local_role].title
+#        objects_string = ''
+#        for object in local_roles[local_role]:
+#            objects_string += '<a href="%s">%s</a>, ' %(view.url(object),
+#                view.url(object).replace(site_url,''))
+#        local_roles_string += '%s: <br />%s <br />' %(role_title,
+#            objects_string.rstrip(', '))
+#    return local_roles_string
+
+#def getGlobalRolesForAccount(account):
+#    """Return HTML tagged string with all global roles of a user account.
+#    """
+#    global_roles = account.roles
+#    global_roles_string = ''
+#    for global_role in global_roles:
+#        role_title = dict(getAllRoles())[global_role].title
+#        global_roles_string += '%s <br />' % role_title
+#    return global_roles_string
 
 def getMyRoles(view):
@@ -183 +183 @@
         self.context = context
         role_ids = getattr(context, 'local_roles', self._roles)
-        self._roles = [(name, role) for name, role in getRoles()
+        self._roles = [(name, role) for name, role in getAllRoles()
                        if name in role_ids]
         return
@@ -214 +214 @@
         user = grok.getSite()['users'].get(user_name,None)
         user_title = getattr(user, 'description', user_name)
-        local_role_title = dict(getRoles())[local_role].title
+        local_role_title = dict(getAllRoles())[local_role].title
         yield dict(user_name = user_name,
                    user_title = user_title,

main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt

@@ -13 +13 @@
 roles.
 
-:func:`getRoles`
-----------------
+:func:`getAllRoles`
+-------------------
 
 Gives us all roles defined in a WAeUP SIRP portal. We get tuples of
@@ -24 +24 @@
 with the ZCA (a string) and ``<ROLE>`` is the real role object.
 
-    >>> from waeup.sirp.permissions import getRoles
-    >>> getRoles()
+    >>> from waeup.sirp.permissions import getAllRoles
+    >>> getAllRoles()
     <generator object...at 0x...>
 
-    >>> sorted(list(getRoles()))
+    >>> sorted(list(getAllRoles()))
     [(u'waeup.AccommodationOfficer', <waeup.sirp.hostels.permissions.AccommodationOfficer object at 0x...]