External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 05:30:18 -03:30
Code Issues Packages Projects Releases Wiki Activity

Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement

Browse Source
This commit is contained in:
Wayne Witzel III
2017-02-24 16:59:39 -05:00
parent 8b383e788b
commit 4d02ee9445
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/consumers.py
View File

@@ -63,7 +63,7 @@ def ws_receive(message):
if 'groups' in data:
discard_groups(message)
groups = data['groups']
current_groups = message.channel_session.pop('groups') if 'groups' in message.channel_session else []
current_groups = set(message.channel_session.pop('groups') if 'groups' in message.channel_session else [])
for group_name,v in groups.items():
if type(v) is list:
for oid in v:
@@ -74,12 +74,12 @@ def ws_receive(message):
if not user_access.get_queryset().filter(pk=oid).exists():
message.reply_channel.send({"text": json.dumps({"error": "access denied to channel {0} for resource id {1}".format(group_name, oid)})})
continue
current_groups.append(name)
current_groups.add(name)
Group(name).add(message.reply_channel)
else:
current_groups.append(group_name)
current_groups.add(group_name)
Group(group_name).add(message.reply_channel)
message.channel_session['groups'] = current_groups
message.channel_session['groups'] = list(current_groups)
def emit_channel_notification(group, payload):