diff --git a/controllers/default.py b/controllers/default.py index f40a915c..e077ddf7 100755 --- a/controllers/default.py +++ b/controllers/default.py @@ -1076,7 +1076,9 @@ def donor_list(): donor_rows = [] max_groupby = 75 # The max number of sponsorships per username for r in db( - ((db.reservations.user_donor_hide == None) | (db.reservations.user_donor_hide == False)) & + # We can't do user_donor_hide == False as this is converted to IS NULL by web2py + # (bug?), so we do user_donor_hide != True + ((db.reservations.user_donor_hide == None) | (db.reservations.user_donor_hide != True)) & (db.reservations.verified_time != None) & (db.reservations.username != None) ).select( diff --git a/modules/usernames.py b/modules/usernames.py index 9b210174..ea83c390 100644 --- a/modules/usernames.py +++ b/modules/usernames.py @@ -115,8 +115,10 @@ def donor_name_for_username(username, include_hidden=False): else: query = ( (db.reservations.username == username) - # Need to check both False (0) and None (NULL) in SQL - & ((db.reservations.user_donor_hide == False) | (db.reservations.user_donor_hide == None)) + # Need to check both False (0) and None (NULL) in SQL. Note we can't do + # user_donor_hide == False as this is converted to IS NULL by web2py + # (bug?), so we do user_donor_hide != True + & ((db.reservations.user_donor_hide == None) | (db.reservations.user_donor_hide != True)) ) for r in db(query).select( db.reservations.verified_donor_title,