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

Avoid updating modified_by from None to None (#11838)

Browse Source 
This should help the case of inventory updates in particular
  where imported hosts are managed by the system
This commit is contained in:
Alan Rominger
2022-08-18 11:39:29 -04:00
committed by GitHub
parent e87fabe6bb
commit 4a8613ce4c
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/models/base.py
View File

@@ -316,16 +316,17 @@ class PrimordialModel(HasEditsMixin, CreatedModifiedModel):
user = get_current_user()
if user and not user.id:
user = None
if not self.pk and not self.created_by:
if (not self.pk) and (user is not None) and (not self.created_by):
self.created_by = user
if 'created_by' not in update_fields:
update_fields.append('created_by')
# Update modified_by if any editable fields have changed
new_values = self._get_fields_snapshot()
if (not self.pk and not self.modified_by) or self._values_have_edits(new_values):
self.modified_by = user
if 'modified_by' not in update_fields:
update_fields.append('modified_by')
if self.modified_by != user:
self.modified_by = user
if 'modified_by' not in update_fields:
update_fields.append('modified_by')
super(PrimordialModel, self).save(*args, **kwargs)
self._prior_values_store = new_values