aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2021-10-04 21:02:37 +0000
committerzsloan2021-10-04 21:02:37 +0000
commit5b116de4aaf796be138ee0ad06c2242b3f3c33c7 (patch)
tree5e236354824bd42df21ddca3c2ff29f363060ff8
parent609865fc42b7436d8c34cdcefd159c3352c5d91c (diff)
downloadgenenetwork2-5b116de4aaf796be138ee0ad06c2242b3f3c33c7.tar.gz
Changed get_user_groups to pull both the ID and details in the for loop from group_list by using group_list.items()
-rw-r--r--wqflask/utility/redis_tools.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/wqflask/utility/redis_tools.py b/wqflask/utility/redis_tools.py
index 99295c67..de9dde46 100644
--- a/wqflask/utility/redis_tools.py
+++ b/wqflask/utility/redis_tools.py
@@ -127,20 +127,20 @@ def check_verification_code(code):
def get_user_groups(user_id):
- # ZS: Get the groups where a user is an admin or a member and
+ # Get the groups where a user is an admin or a member and
# return lists corresponding to those two sets of groups
- admin_group_ids = [] # ZS: Group IDs where user is an admin
- user_group_ids = [] # ZS: Group IDs where user is a regular user
+ admin_group_ids = [] # Group IDs where user is an admin
+ user_group_ids = [] # Group IDs where user is a regular user
groups_list = Redis.hgetall("groups")
- for key in groups_list:
+ for group_id, group_details in groups_list.items():
try:
- group_ob = json.loads(groups_list[key])
- group_admins = set([this_admin if this_admin else None for this_admin in group_ob['admins']])
- group_members = set([this_member if this_member else None for this_member in group_ob['members']])
+ _details = json.loads(group_details)
+ group_admins = set([this_admin if this_admin else None for this_admin in _details['admins']])
+ group_members = set([this_member if this_member else None for this_member in _details['members']])
if user_id in group_admins:
- admin_group_ids.append(group_ob['id'])
+ admin_group_ids.append(group_id)
elif user_id in group_members:
- user_group_ids.append(group_ob['id'])
+ user_group_ids.append(group_id)
else:
continue
except: