Guard against None value of User.email attribute

If email was not specified during User creation (it's not required), it will be `None`. It would be safer to guard against already existing `None` values than to prevent creating new user with email == `None`. Change-Id: Id81a94491918190ceae4b08cd3293250bb4ab194 Closes-Bug: #1383630
openstack · Oct 29, 2014 · 89ee107 · 89ee107
1 parent f97a650
commit 89ee107
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/openstack_dashboard/dashboards/identity/groups/tables.py b/openstack_dashboard/dashboards/identity/groups/tables.py
@@ -131,7 +131,7 @@ def filter(self, table, users, filter_string):
         q = filter_string.lower()
         return [user for user in users
                 if q in user.name.lower()
-                or q in getattr(user, 'email', '').lower()]
+                or q in (getattr(user, 'email', None) or '').lower()]
 
 
 class RemoveMembers(tables.DeleteAction):

diff --git a/openstack_dashboard/dashboards/identity/users/tables.py b/openstack_dashboard/dashboards/identity/users/tables.py
@@ -156,7 +156,7 @@ def filter(self, table, users, filter_string):
         q = filter_string.lower()
         return [user for user in users
                 if q in user.name.lower()
-                or q in getattr(user, 'email', '').lower()]
+                or q in (getattr(user, 'email', None) or '').lower()]
 
 
 class UsersTable(tables.DataTable):