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

track prior organization_id by base model prior values tore

Browse Source 
Also fix bug where unified pointers were counted in
the prior values store
This commit is contained in:
AlanCoding
2018-05-18 07:52:19 -04:00
parent 967624c576
commit b7e9bda6cf
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/fields.py
View File

@@ -218,6 +218,7 @@ class ImplicitRoleField(models.ForeignKey):
kwargs.setdefault('to', 'Role') kwargs.setdefault('to', 'Role')
kwargs.setdefault('related_name', '+') kwargs.setdefault('related_name', '+')
kwargs.setdefault('null', 'True') kwargs.setdefault('null', 'True')
kwargs.setdefault('editable', False)
super(ImplicitRoleField, self).__init__(*args, **kwargs) super(ImplicitRoleField, self).__init__(*args, **kwargs)
def deconstruct(self): def deconstruct(self):

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

@@ -290,6 +290,10 @@ class PrimordialModel(CreatedModifiedModel):
if hasattr(field, 'attname'): if hasattr(field, 'attname'):
if field.attname == 'id': if field.attname == 'id':
continue continue
elif field.attname.endswith('ptr_id'):
# polymorphic fields should always be non-editable, see:
# https://github.com/django-polymorphic/django-polymorphic/issues/349
continue
if getattr(field, 'editable', True): if getattr(field, 'editable', True):
fds.add(field.attname) fds.add(field.attname)
return fds return fds

13
awx/main/signals.py
View File

@@ -10,7 +10,6 @@ import json
# Django # Django
from django.conf import settings from django.conf import settings
from django.db.models.signals import ( from django.db.models.signals import (
post_init,
post_save, post_save,
pre_delete, pre_delete,
post_delete, post_delete,
@@ -200,14 +199,6 @@ def cleanup_detached_labels_on_deleted_parent(sender, instance, **kwargs):
l.delete() l.delete()
def set_original_organization(sender, instance, **kwargs):
'''set_original_organization is used to set the original, or
pre-save organization, so we can later determine if the organization
field is dirty.
'''
instance.__original_org_id = instance.organization_id
def save_related_job_templates(sender, instance, **kwargs): def save_related_job_templates(sender, instance, **kwargs):
'''save_related_job_templates loops through all of the '''save_related_job_templates loops through all of the
job templates that use an Inventory or Project that have had their job templates that use an Inventory or Project that have had their
@@ -217,7 +208,7 @@ def save_related_job_templates(sender, instance, **kwargs):
if sender not in (Project, Inventory): if sender not in (Project, Inventory):
raise ValueError('This signal callback is only intended for use with Project or Inventory') raise ValueError('This signal callback is only intended for use with Project or Inventory')
if instance.__original_org_id != instance.organization_id: if instance._prior_values_store.get('organization_id') != instance.organization_id:
jtq = JobTemplate.objects.filter(**{sender.__name__.lower(): instance}) jtq = JobTemplate.objects.filter(**{sender.__name__.lower(): instance})
for jt in jtq: for jt in jtq:
update_role_parentage_for_instance(jt) update_role_parentage_for_instance(jt)
@@ -240,8 +231,6 @@ def connect_computed_field_signals():
connect_computed_field_signals() connect_computed_field_signals()
post_init.connect(set_original_organization, sender=Project)
post_init.connect(set_original_organization, sender=Inventory)
post_save.connect(save_related_job_templates, sender=Project) post_save.connect(save_related_job_templates, sender=Project)
post_save.connect(save_related_job_templates, sender=Inventory) post_save.connect(save_related_job_templates, sender=Inventory)
post_save.connect(emit_job_event_detail, sender=JobEvent) post_save.connect(emit_job_event_detail, sender=JobEvent)