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

Fix an issue with the Activity Stream where we weren't performing the right type conversion to track object types

Browse Source
This commit is contained in:
Matthew Jones
2013-11-08 11:08:11 -05:00
parent b7b22fa7f8
commit 710b01c333
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/signals.py
View File

@@ -177,21 +177,21 @@ def activity_stream_create(sender, instance, created, **kwargs):
activity_entry = ActivityStream(
operation='create',
object1_id=instance.id,
object1_type=instance.__class__)
object1_type=str(instance.__class__))
activity_entry.save()
def activity_stream_update(sender, instance, **kwargs):
try:
old = sender.objects.get(id=instance.id)
except sender.DoesNotExist:
pass
return
new = instance
changes = model_instance_diff(old, new)
activity_entry = ActivityStream(
operation='update',
object1_id=instance.id,
object1_type=instance.__class__,
object1_type=str(instance.__class__),
changes=json.dumps(changes))
activity_entry.save()
@@ -200,7 +200,7 @@ def activity_stream_delete(sender, instance, **kwargs):
activity_entry = ActivityStream(
operation='delete',
object1_id=instance.id,
object1_type=instance.__class__)
object1_type=str(instance.__class__))
activity_entry.save()
def activity_stream_associate(sender, instance, **kwargs):
@@ -220,8 +220,8 @@ def activity_stream_associate(sender, instance, **kwargs):
activity_entry = ActivityStream(
operation=action,
object1_id=obj1_id,
object1_type=obj1.__class__,
object1_type=str(obj1.__class__),
object2_id=obj2_id,
object2_type=obj2.__class__,
object2_type=str(obj2.__class__),
object_relationship_type=obj_rel)
activity_entry.save()