From ac7d50048cd2584244f9146015808703eb5973f1 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Wed, 10 Feb 2016 16:09:57 -0500 Subject: [PATCH] Removing unused resource_parent Forgot to remove these bits when we removed the concept a few commits ago --- awx/main/fields.py | 18 ++---------------- awx/main/models/rbac.py | 2 -- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index 7d903d1278..e002ab74c9 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -55,8 +55,7 @@ def resolve_field(obj, field): class ResourceFieldDescriptor(ReverseSingleRelatedObjectDescriptor): """Descriptor for access to the object from its related class.""" - def __init__(self, parent_resource, *args, **kwargs): - self.parent_resource = parent_resource + def __init__(self, *args, **kwargs): super(ResourceFieldDescriptor, self).__init__(*args, **kwargs) def __get__(self, instance, instance_type=None): @@ -64,18 +63,6 @@ class ResourceFieldDescriptor(ReverseSingleRelatedObjectDescriptor): if resource: return resource resource = Resource._default_manager.create() - if self.parent_resource: - # Take first non null parent resource - parent = None - if type(self.parent_resource) is list: - for path in self.parent_resource: - parent = resolve_field(instance, path) - if parent: - break - else: - parent = resolve_field(instance, self.parent_resource) - resource.parent = parent - resource.save() setattr(instance, self.field.name, resource) instance.save(update_fields=[self.field.name,]) return resource @@ -84,8 +71,7 @@ class ResourceFieldDescriptor(ReverseSingleRelatedObjectDescriptor): class ImplicitResourceField(models.ForeignKey): """Creates an associated resource object if one doesn't already exist""" - def __init__(self, parent_resource=None, *args, **kwargs): - self.parent_resource = parent_resource + def __init__(self, *args, **kwargs): kwargs.setdefault('to', 'Resource') kwargs.setdefault('related_name', '+') kwargs.setdefault('null', 'True') diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py index 75ff67cb96..1268f68443 100644 --- a/awx/main/models/rbac.py +++ b/awx/main/models/rbac.py @@ -113,8 +113,6 @@ class Resource(CommonModelNameNotUnique): verbose_name_plural = _('resources') db_table = 'main_rbac_resources' - parent = models.ForeignKey('Resource', related_name='children', null=True, default=None) - class RolePermission(CreatedModifiedModel): '''