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

Fix some inconsistencies after the merge

Browse Source
This commit is contained in:
Matthew Jones
2013-11-08 10:04:12 -05:00
parent 2a16ab38a5
commit 2ab4cab495
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/registrar.py
View File

@@ -1,5 +1,5 @@
from django.db.models.signals import pre_save, post_save, post_delete, m2m_changed
from signals import activity_stream_create, activity_stream_update, activity_stream_delete
from signals import activity_stream_create, activity_stream_update, activity_stream_delete, activity_stream_associate
class ActivityStreamRegistrar(object):
@@ -10,25 +10,25 @@ class ActivityStreamRegistrar(object):
#(receiver, sender=model, dispatch_uid=self._dispatch_uid(signal, model))
if model not in self.models:
self.models.append(model)
post_save.connect(activity_stream_create, sender=model, dispatch_uid=self.__class__ + str(model) + "_create")
pre_save.connect(activity_stream_update, sender=model, dispatch_uid=self.__class__ + str(model) + "_update")
post_delete.connect(activity_stream_delete, sender=model, dispatch_uid=self.__class__ + str(model) + "_delete")
post_save.connect(activity_stream_create, sender=model, dispatch_uid=str(self.__class__) + str(model) + "_create")
pre_save.connect(activity_stream_update, sender=model, dispatch_uid=str(self.__class__) + str(model) + "_update")
post_delete.connect(activity_stream_delete, sender=model, dispatch_uid=str(self.__class__) + str(model) + "_delete")
for m2mfield in model._meta.many_to_many:
m2m_attr = get_attr(model, m2mfield.name)
m2m_attr = getattr(model, m2mfield.name)
m2m_changed.connect(activity_stream_associate, sender=m2m_attr.through,
dispatch_uid=self.__class__ + str(m2m_attr.through) + "_associate")
dispatch_uid=str(self.__class__) + str(m2m_attr.through) + "_associate")
def disconnect(self, model):
if model in self.models:
post_save.disconnect(dispatch_uid=self.__class__ + str(model) + "_create")
pre_save.disconnect(dispatch_uid=self.__class__ + str(model) + "_update")
post_delete.disconnect(dispatch_uid=self.__class__ + str(model) + "_delete")
post_save.disconnect(dispatch_uid=str(self.__class__) + str(model) + "_create")
pre_save.disconnect(dispatch_uid=str(self.__class__) + str(model) + "_update")
post_delete.disconnect(dispatch_uid=str(self.__class__) + str(model) + "_delete")
self.models.pop(model)
for m2mfield in model._meta.many_to_many:
m2m_attr = get_attr(model, m2mfield.name)
m2m_changed.disconnect(dispatch_uid=self.__class__ + str(m2m_attr.through) + "_associate")
m2m_attr = getattr(model, m2mfield.name)
m2m_changed.disconnect(dispatch_uid=str(self.__class__) + str(m2m_attr.through) + "_associate")
activity_stream_registrar = ActivityStreamRegistrar()