From ae9b4d3e58b128bd5913341781c1d878bfb49971 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Fri, 8 Jul 2016 13:13:22 -0400 Subject: [PATCH] Revert "Fix up hook conditions for rbac activity stream" This reverts commit 36c14f83bcb11fcdbd31140ce182ab87e3db4644. --- awx/main/signals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/signals.py b/awx/main/signals.py index b74c99dcba..1c57fea8ae 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -159,7 +159,7 @@ def org_admin_edit_members(instance, action, model, reverse, pk_set, **kwargs): def rbac_activity_stream(instance, sender, **kwargs): user_type = ContentType.objects.get_for_model(User) # Only if we are associating/disassociating - if kwargs['action'] in ['post_add', 'pre_remove']: + if kwargs['action'] in ['pre_add', 'pre_remove']: # Only if this isn't for the User.admin_role if hasattr(instance, 'content_type'): if instance.content_type in [None, user_type]: @@ -396,7 +396,7 @@ def activity_stream_delete(sender, instance, **kwargs): def activity_stream_associate(sender, instance, **kwargs): if not activity_stream_enabled: return - if kwargs['action'] in ['post_add', 'pre_remove']: + if kwargs['action'] in ['pre_add', 'pre_remove']: if kwargs['action'] == 'pre_add': action = 'associate' elif kwargs['action'] == 'pre_remove':