use explicit in lookup (#25502)

Delete unused function using implicit in lookup.
This commit is contained in:
Emmanuel Cazenave 2018-07-27 15:37:45 +02:00
parent d7a2af17c3
commit d024517025
4 changed files with 4 additions and 18 deletions

View File

@ -149,10 +149,10 @@ class User(AbstractBaseUser, PermissionMixin):
def roles_and_parents(self):
qs1 = self.roles.all()
qs2 = qs1.model.objects.filter(child_relation__child=qs1)
qs2 = qs1.model.objects.filter(child_relation__child__in=qs1)
qs = (qs1 | qs2).order_by('name').distinct()
RoleParenting = get_role_parenting_model()
rp_qs = RoleParenting.objects.filter(child=qs1)
rp_qs = RoleParenting.objects.filter(child__in=qs1)
qs = qs.prefetch_related(models.Prefetch(
'child_relation', queryset=rp_qs), 'child_relation__parent')
qs = qs.prefetch_related(models.Prefetch(

View File

@ -419,7 +419,7 @@ class UserRolesView(HideOUColumnMixin, BaseSubTableView):
User = get_user_model()
Role = get_role_model()
RoleParenting = get_role_parenting_model()
rp_qs = RoleParenting.objects.filter(child=roles)
rp_qs = RoleParenting.objects.filter(child__in=roles)
qs = Role.objects.all()
qs = qs.prefetch_related(models.Prefetch(
'child_relation', queryset=rp_qs, to_attr='via'))

View File

@ -83,7 +83,7 @@ class PermissionQueryset(query.QuerySet):
'''
Role = utils.get_role_model()
roles = Role.objects.for_user(user=user)
return self.filter(roles=roles)
return self.filter(roles__in=roles)
def cleanup(self):
count = 0

View File

@ -60,20 +60,6 @@ def get_permission_model():
'''Returns the currently configured permission model'''
return get_swapped_model(constants.RBAC_PERMISSION_MODEL_SETTING)
def get_objects_with_permission(user, operation_slug, model):
'''Returns a list of objects for which this user has the permission for the
given operation.
'''
Permission = get_permission_model()
OrganizationalUnit = get_ou_model()
permissions = Permission.objects.for_user(user).filter(operation__slug=operation_slug)
if permissions.filter(ou__isnull=True).exists():
return model.objects.all()
if model._meta.get_field('ou'):
ous = OrganizationalUnit.objects.filter(scoped_permission=permissions)
return model.objects.filer(ou=ous)
else:
return model.objects.none()
def get_operation(operation_tpl):
from . import models