commit 14b6bcd5cfd2bd828265db111c73e50ba990d1f2
author Alexander Luberg <aluberg@slashdotmedia.com> Mon Oct 06 11:05:57 2014 -0700
committer Dave Brondsema <dbrondsema@slashdotmedia.com> Sat Oct 11 16:58:24 2014 +0000
tree 3a20a16bc120e3abf5f5b6980311dd3c3d604ae5
parent 0c4699adafadf9cb4e559fe18e472d002f517f67

[#7675] Removed None elements from roles list

Allura/allura/app.py

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 4fad3f4..fff483d 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -837,8 +837,7 @@
                 if (acl['permission'] == perm) and (str(acl['role_id']) not in group_ids) and acl['access'] != model.ACE.DENY:
                     del_group_ids.append(str(acl['role_id']))
 
-            get_role = lambda _id: model.ProjectRole.query.get(
-                _id=ObjectId(_id))
+            get_role = lambda _id: model.ProjectRole.query.get(_id=ObjectId(_id))
             groups = map(get_role, group_ids)
             new_groups = map(get_role, new_group_ids)
             del_groups = map(get_role, del_group_ids)
@@ -846,10 +845,8 @@
             if new_groups or del_groups:
                 model.AuditLog.log('updated "%s" permission: "%s" => "%s" for %s' % (
                     perm,
-                    ', '.join(
-                        map(lambda role: role.name, groups + del_groups)),
-                    ', '.join(
-                        map(lambda role: role.name, groups + new_groups)),
+                    ', '.join(map(lambda role: role.name, filter(None, groups + del_groups))),
+                    ', '.join(map(lambda role: role.name, filter(None, groups + new_groups))),
                     self.app.config.options['mount_point']))
 
             role_ids = map(ObjectId, group_ids + new_group_ids)