Skip to content
Snippets Groups Projects
Commit 4c29d855 authored by ynerant's avatar ynerant
Browse files

Fix RolePermissions merge

parent 55bc288d
No related branches found
No related tags found
1 merge request!86Pre-beta fixes
Pipeline #8244 passed with stages
in 3 minutes and 42 seconds
......@@ -37,17 +37,17 @@ class PermissionBackend(ModelBackend):
return Permission.objects.none()
qs = Permission.objects.annotate(
club=F("role__role__membership__club"),
membership=F("role__role__membership"),
club=F("role__membership__club"),
membership=F("role__membership"),
).filter(
(
Q(
role__role__membership__date_start__lte=timezone.now().today(),
role__role__membership__date_end__gte=timezone.now().today(),
role__membership__date_start__lte=timezone.now().today(),
role__membership__date_end__gte=timezone.now().today(),
)
| Q(permanent=True)
)
& Q(role__role__membership__user=user)
& Q(role__membership__user=user)
& Q(type=t)
& Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment