Changeset 6181

Timestamp:

21 May 2011, 07:46:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement changes in r6180 for academics section. There are some bugs, see email.

Location:

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

Files:

• pages.py (modified) (5 diffs)
• templates/usercontainerpage.pt (modified) (2 diffs)

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

@@ -23 +23 @@
 from zope.exceptions import DuplicationError
 from zope.session.interfaces import ISession
+from zope.event import notify
 from waeup.sirp.browser.resources import warning, datepicker, tabs, datatable
 from waeup.sirp.browser import (
@@ -40 +41 @@
 from waeup.sirp.university.vocabularies import course_levels
 from waeup.sirp.widgets.restwidget import ReSTDisplayWidget
+from waeup.sirp.users import LocalRoleSetEvent
 
 grok.context(IWAeUPObject)
@@ -50 +52 @@
     role_manager = IPrincipalRoleManager(view.context)
     role_manager.assignRoleToPrincipal(localrole, user)
+    notify(LocalRoleSetEvent(view.context, localrole, user, granted=True))
+    #import pdb; pdb.set_trace()
     view.redirect(view.url(view.context, u'@@manage')+'#tab-%s' % tab)
     return
@@ -63 +67 @@
     if not isinstance(child_id, list):
         child_id = [child_id]
-    #import pdb; pdb.set_trace()
     deleted = []
     role_manager = IPrincipalRoleManager(view.context)
@@ -71 +74 @@
         try:
             role_manager.unsetRoleForPrincipal(localrole, user_name)
+            notify(LocalRoleSetEvent(view.context, localrole, user_name, granted=False))
             deleted.append(id)
         except:

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

@@ -11 +11 @@
       <th>Title</th>
       <th>Description</th>
+      <th>Local Roles</th>
       <th>Actions</th>
     </tr>
@@ -19 +20 @@
       <td tal:content="account/title">Title</td>
       <td tal:content="account/description">Description</td>
+      <td tal:content="account/getLocalRoles">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="delete" value="delete" />
-        </form>
+        <form method="post">
+          <input type="hidden" name="userid"
+           tal:attributes="value account/name"/>
+            <input type="submit" name="edit" value="edit" />
+            <input type="submit" name="delete" value="delete" />
+        </form>
       </td>
     </tr>