Changeset 7104 for main

Timestamp:

13 Nov 2011, 14:30:44 (13 years ago)

Author:

uli

Message:

Tiny cleanups.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py (modified) (2 diffs)

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

@@ -47 +47 @@
 
 def add_local_role(view, tab, **data):
-    form = view.request.form
-    localrole = form['local_role']
-    if form.has_key('user'):
-        user = form['user']
-    else:
+    localrole = view.request.form.get('local_role', None)
+    user = view.request.form.get('user', None)
+    if user is None or localrole is None:
         view.flash('No user selected.')
         view.redirect(view.url(view.context, '@@manage')+'#tab-%s' % tab)
@@ -58 +56 @@
     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
 
 def del_local_roles(view, tab, **data):
-    form = view.request.form
-    if form.has_key('role_id'):
-        child_id = form['role_id']
-    else:
+    child_ids = view.request.form.get('role_id', None)
+    if child_ids is None:
         view.flash('No local role selected.')
         view.redirect(view.url(view.context, '@@manage')+'#tab-%s' % tab)
         return
-    if not isinstance(child_id, list):
-        child_id = [child_id]
+    if not isinstance(child_ids, list):
+        child_ids = [child_ids]
     deleted = []
     role_manager = IPrincipalRoleManager(view.context)
-    for id in child_id:
-        localrole = id.split('|')[1]
-        user_name = id.split('|')[0]
+    for child_id in child_ids:
+        localrole = child_id.split('|')[1]
+        user_name = child_id.split('|')[0]
         try:
             role_manager.unsetRoleForPrincipal(localrole, user_name)
-            notify(LocalRoleSetEvent(view.context, localrole, user_name, granted=False))
-            deleted.append(id)
+            notify(LocalRoleSetEvent(
+                    view.context, localrole, user_name, granted=False))
+            deleted.append(child_id)
         except:
             view.flash('Could not remove %s: %s: %s' % (
-                    id, sys.exc_info()[0], sys.exc_info()[1]))
+                    child_id, sys.exc_info()[0], sys.exc_info()[1]))
     if len(deleted):
         view.flash('Successfully removed: %s' % ', '.join(deleted))