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

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/browser

Files:

• browser.txt (modified) (1 diff)
• pages.py (modified) (1 diff)
• templates/userscontainerpage.pt (modified) (2 diffs)

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">