shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Merge pull request #86 from chrismeyersfsu/fix-scm_delete_on_next_update

Browse Source 
bandaid for scm_delete_on_next_update save issue
This commit is contained in:
Chris Meyers 2015-02-23 13:32:32 -05:00
commit 47541afca1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,15 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique):
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.
super(UnifiedJobTemplate, self).save(*args, **kwargs) 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)
def _get_current_status(self): def _get_current_status(self):
# Override in subclasses as needed. # Override in subclasses as needed.