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

fix cross-talk between JT-proj due to arg mutability

Browse Source
This commit is contained in:
AlanCoding
2018-04-24 10:49:04 -04:00
parent 68975572f3
commit 13550acb91
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/unified_jobs.py
View File

@@ -263,13 +263,6 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
if field not in update_fields: if field not in update_fields:
update_fields.append(field) update_fields.append(field)
# Do the actual save. # Do the actual save.
try:
super(UnifiedJobTemplate, self).save(*args, **kwargs)
except ValueError:
# A fix for https://trello.com/c/S4rU1F21
# Does not resolve the root cause. Tis merely a bandaid.
if 'scm_delete_on_next_update' in update_fields:
update_fields.remove('scm_delete_on_next_update')
super(UnifiedJobTemplate, self).save(*args, **kwargs) super(UnifiedJobTemplate, self).save(*args, **kwargs)
@@ -722,7 +715,10 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
def _get_parent_instance(self): def _get_parent_instance(self):
return getattr(self, self._get_parent_field_name(), None) return getattr(self, self._get_parent_field_name(), None)
def _update_parent_instance_no_save(self, parent_instance, update_fields=[]): def _update_parent_instance_no_save(self, parent_instance, update_fields=None):
if update_fields is None:
update_fields = []
def parent_instance_set(key, val): def parent_instance_set(key, val):
setattr(parent_instance, key, val) setattr(parent_instance, key, val)
if key not in update_fields: if key not in update_fields: