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

AC-1040 Unified jobs updates to get unit tests to pass (hopefully).

Browse Source
This commit is contained in:
Chris Church
2014-03-20 19:16:58 -04:00
parent 0ee5c07738
commit 691942cac3
16 changed files with 519 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/activity_stream.py
View File

@@ -58,12 +58,12 @@ class ActivityStreamBase(models.Model):
# For compatibility with Django 1.4.x, attempt to handle any calls to
# save that pass update_fields.
try:
super(ActivityStream, self).save(*args, **kwargs)
super(ActivityStreamBase, self).save(*args, **kwargs)
except TypeError:
if 'update_fields' not in kwargs:
raise
kwargs.pop('update_fields')
super(ActivityStream, self).save(*args, **kwargs)
super(ActivityStreamBase, self).save(*args, **kwargs)
if getattr(settings, 'UNIFIED_JOBS_STEP') == 0: