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

Timestamp:

22 Nov 2011, 07:25:31 (13 years ago)

Author:

Henrik Bettermann

Message:

Move getGlobalRoles and getLocalRoles to SiteLayout? class so that we can put these strings into the personal box of officers.

Rename UserEditFormPage? to UserManageFormPage? and omit name field when editing user data. User ids can't be edited.

Location:

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

Files:

• browser.txt (modified) (1 diff)
• layout.py (modified) (2 diffs)
• pages.py (modified) (3 diffs)
• templates/usercontainerpage.pt (modified) (1 diff)
• tests/test_permissions.py (modified) (1 diff)

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

@@ -135 +135 @@
 We can edit user bob:
 
-  >>> browser.getControl("edit", index=0).click()
+  >>> browser.getControl("manage", index=0).click()
   >>> browser.getControl("Save", index=0).click()
   >>> browser.getControl("Cancel", index=0).click()

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')
@@ -165 +166 @@
     def isStudent(self):
         prm = get_principal_role_manager()
-        roles = [x[0] for x in prm.getRolesForPrincipal(self.request.principal.id)]
+        roles = [x[0] for x in
+            prm.getRolesForPrincipal(self.request.principal.id)]
         return 'waeup.Student' in roles
+
+    def getLocalRoles(self, account):
+        """Return HTML tagged string with all local roles of a user account.
+        """
+        local_roles = account.getLocalRoles()
+        local_roles_string = ''
+        site_url = self.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>, ' %(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 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 update(self):

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, getRoles
+from waeup.sirp.permissions import get_users_with_local_roles
 from waeup.sirp.university.catalog import search
 from waeup.sirp.university.vocabularies import course_levels
@@ -253 +253 @@
     title = 'Portal Users'
 
-    def update(self, userid=None, adduser=None, edit=None, delete=None):
-        if edit is not None and userid is not None:
-            self.redirect(self.url(userid))
+    def update(self, userid=None, adduser=None, manage=None, delete=None):
+        if manage is not None and userid is not None:
+            self.redirect(self.url(userid) + '/@@manage')
         if delete is not None and userid is not None:
             self.context.delUser(userid)
             self.flash('User %s successfully deleted.' % userid)
-
-    def getLocalRoles(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(getRoles())[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: %s <br />' %(role_title,
-                objects_string.rstrip(', '))
-        return local_roles_string
-
-    def getGlobalRoles(self,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
 
 class AddUserFormPage(WAeUPAddFormPage):
@@ -316 +294 @@
         self.redirect(self.url(self.context))
 
-class UserEditFormPage(WAeUPEditFormPage):
-    """Edit a user account.
+class UserManageFormPage(WAeUPEditFormPage):
+    """Manage a user account.
     """
     grok.context(IUserAccount)
-    grok.name('index')
-
-    form_fields = grok.AutoFields(IUserAccount)
+    grok.name('manage')
+    grok.template('usereditformpage')
+
+    form_fields = grok.AutoFields(IUserAccount).omit('name')
     grok.require('waeup.manageUsers')
 
-    title = "Edit user"
+    title = "Portal Users"
+
+    def label(self):
+        return "Edit user %s" % self.context.__name__
 
     @grok.action('Save')

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

@@ -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:layout.getGlobalRoles(account)">Global Roles</td>
+      <td tal:content="structure python:layout.getLocalRoles(account)">Local Roles</td>
       <td class="text-right">
         <form method="post">
           <input type="hidden" name="userid"
            tal:attributes="value account/name"/>
-            <input type="submit" name="edit" value="edit" />
+            <input type="submit" name="manage" value="manage" />
             <input type="submit" name="delete" value="delete" />
         </form>

main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_permissions.py

@@ -43 +43 @@
     # The pages that should only be accessible by manager...
     '/@@manage', '/@@administration', '/faculties/@@search',
-    '/users/@@index', '/users/@@add', '/users/alice/@@index',
+    '/users/@@index', '/users/@@add', '/users/alice/@@manage',
     '/datacenter/@@index', '/datacenter/@@upload', '/datacenter/@@import1',
     '/datacenter/@@import2', '/datacenter/@@import3', '/datacenter/@@import4',