External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 13:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed up User.accessible_objects to return a User queryset

Browse Source 
Was returnning a RolePermission qs, needed to be a User qs to match.
Also bolted on the role_permissions GenericRelation so we could just
reuse the ResourceMixin accessible_objects code
This commit is contained in:
Akita Noek
2016-03-16 10:26:53 -04:00
parent 9909ea90c1
commit 7ec3b3b8b5
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/__init__.py
View File

@@ -3,6 +3,7 @@
# Django
from django.conf import settings # noqa
from django.contrib.contenttypes.fields import GenericRelation
# AWX
from awx.main.models.base import * # noqa
@@ -38,11 +39,13 @@ _PythonSerializer.handle_m2m_field = _new_handle_m2m_field
from django.contrib.auth.models import User # noqa
from awx.main.access import * # noqa
User.add_to_class('get_queryset', get_user_queryset)
User.add_to_class('can_access', check_user_access)
User.add_to_class('accessible_by', user_accessible_by)
User.add_to_class('accessible_objects', user_accessible_objects)
User.add_to_class('admin_role', user_admin_role)
User.add_to_class('role_permissions', GenericRelation('main.RolePermission'))
# Import signal handlers only after models have been defined.
import awx.main.signals # noqa