From a6f735b4b9e4b8c837d6cf324c5b7b7ab7b88b85 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Wed, 27 Apr 2016 15:27:52 -0400 Subject: [PATCH] Fixed call to role rebuilder during migrations --- awx/main/fields.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index d08bbdfb14..b77452ca5b 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -20,9 +20,10 @@ from django.db.models.fields.related import ( from django.utils.encoding import smart_text # AWX -from awx.main.models.rbac import batch_role_ancestor_rebuilding +from awx.main.models.rbac import batch_role_ancestor_rebuilding, Role from awx.main.utils import get_current_apps + __all__ = ['AutoOneToOneField', 'ImplicitRoleField'] @@ -199,7 +200,7 @@ class ImplicitRoleField(models.ForeignKey): updates[role.role_field] = role.id role_ids.append(role.id) type(instance).objects.filter(pk=instance.pk).update(**updates) - Role_.rebuild_role_ancestor_list(role_ids, []) + Role.rebuild_role_ancestor_list(role_ids, []) # Update parentage if necessary for implicit_role_field in getattr(instance.__class__, '__implicit_role_fields'): @@ -255,4 +256,4 @@ class ImplicitRoleField(models.ForeignKey): Role_ = get_current_apps().get_model('main', 'Role') child_ids = [x for x in Role_.parents.through.objects.filter(to_role_id__in=role_ids).distinct().values_list('from_role_id', flat=True)] Role_.objects.filter(id__in=role_ids).delete() - Role_.rebuild_role_ancestor_list([], child_ids) + Role.rebuild_role_ancestor_list([], child_ids)