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

Timestamp:

23 Nov 2011, 09:32:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Let's be more precise: Global roles actually are site roles. Since the user does not understand the term 'site' we should use the term 'portal' in the UI instead. Now we have portal (site) roles, local roles and dynamic roles.

Location:

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

Files:

• applicants/permissions.py (modified) (1 diff)
• browser/browser.txt (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• browser/templates/userscontainerpage.pt (modified) (2 diffs)
• hostels/permissions.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• permissions.py (modified) (2 diffs)
• students/permissions.py (modified) (1 diff)

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

@@ -42 +42 @@
     grok.permissions('waeup.handleApplication', 'waeup.viewApplication')
 
-# Global role
+# Site role
 
 class ApplicantRole(grok.Role):

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

@@ -139 +139 @@
   >>> browser.getControl("Cancel", index=0).click()
 
-We can add global roles which are then displayed on the user container page.
-Since the test browser does not use javascript, we have to add global roles
+We can add site roles which are then displayed on the user container page.
+Since the test browser does not use javascript, we have to add site roles
 manually by setting the roles attribute:
 

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

@@ -274 +274 @@
         return local_roles_string
 
-    def getGlobalRoles(self, 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 getSiteRoles(self, account):
+        site_roles = account.roles
+        site_roles_string = ''
+        for site_role in site_roles:
+            role_title = dict(getAllRoles())[site_role].title
+            site_roles_string += '%s <br />' % role_title
+        return site_roles_string
 
 class AddUserFormPage(WAeUPAddFormPage):

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt

@@ -11 +11 @@
       <th>Name</th>
       <th>Description</th>
-      <th>Global roles</th>
-      <th>Local roles</th>
+      <th>Portal Roles</th>
+      <th>Local Roles</th>
       <th></th>
     </tr>
@@ -21 +21 @@
       <td tal:content="account/title">Title</td>
       <td tal:content="account/description">Description</td>
-      <td tal:content="structure python:view.getGlobalRoles(account)">Global Roles</td>
-      <td tal:content="structure python:view.getLocalRoles(account)">Local Roles</td>
+      <td tal:content="structure python:view.getSiteRoles(account)">SITE ROLES</td>
+      <td tal:content="structure python:view.getLocalRoles(account)">LOCAL ROLES</td>
       <td class="text-right">
         <form method="post">

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

@@ -27 +27 @@
     grok.name('waeup.manageHostels')
 
-# Global Roles
+# Site Roles
 class AccommodationOfficer(grok.Role):
     grok.name('waeup.AccommodationOfficer')

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

@@ -77 +77 @@
 
 class RoleSource(BasicSourceFactory):
-    """A source for global roles.
+    """A source for site roles.
     """
     def getValues(self):
@@ -189 +189 @@
         required = False,)
     roles = schema.List(
-        title = u'Global roles',
+        title = u'Portal roles',
         value_type = schema.Choice(source=RoleSource()))
 

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

@@ -67 +67 @@
     grok.permissions('waeup.editUser')
 
-# Global Roles
+# Site Roles
 class PortalUser(grok.Role):
     grok.name('waeup.PortalUser')
@@ -119 +119 @@
     """
     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(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):
-    account = get_user_account(view.request)
-    if account:
-        global_roles = getGlobalRoles(account)
-        local_roles = getLocalRoles(account)
-        return [global_roles,local_roles]
-    return
-
 
 class LocalRolesAssignable(grok.Adapter):

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

@@ -46 +46 @@
                      'waeup.viewStudent', 'waeup.payStudent')
 
-# Global Roles
+# Site Roles
 class StudentRole(grok.Role):
     grok.name('waeup.Student')