mirror of
https://github.com/ansible/awx.git
synced 2026-05-06 17:07:36 -02:30
Add django-ansible-base (#14705)
* add django-ansible-base Signed-off-by: jessicamack <jmack@redhat.com> * add licenses * add django-ansible-base Signed-off-by: jessicamack <jmack@redhat.com> * add licenses * apply patch to fix permissions issue --------- Signed-off-by: jessicamack <jmack@redhat.com>
This commit is contained in:
@@ -64,7 +64,7 @@ class ResourceMixin(models.Model):
|
||||
|
||||
@staticmethod
|
||||
def _accessible_pk_qs(cls, accessor, role_field, content_types=None):
|
||||
if type(accessor) == User:
|
||||
if accessor._meta.model_name == 'user':
|
||||
ancestor_roles = accessor.roles.all()
|
||||
elif type(accessor) == Role:
|
||||
ancestor_roles = [accessor]
|
||||
|
||||
@@ -170,7 +170,7 @@ class Role(models.Model):
|
||||
return reverse('api:role_detail', kwargs={'pk': self.pk}, request=request)
|
||||
|
||||
def __contains__(self, accessor):
|
||||
if type(accessor) == User:
|
||||
if accessor._meta.model_name == 'user':
|
||||
return self.ancestors.filter(members=accessor).exists()
|
||||
elif accessor.__class__.__name__ == 'Team':
|
||||
return self.ancestors.filter(pk=accessor.member_role.id).exists()
|
||||
|
||||
@@ -336,6 +336,7 @@ INSTALLED_APPS = [
|
||||
'awx.ui',
|
||||
'awx.sso',
|
||||
'solo',
|
||||
'ansible_base',
|
||||
]
|
||||
|
||||
INTERNAL_IPS = ('127.0.0.1',)
|
||||
|
||||
Reference in New Issue
Block a user