mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-31 15:50:03 +01:00 
			
		
		
		
	Fix RolePermissions merge
This commit is contained in:
		| @@ -37,17 +37,17 @@ class PermissionBackend(ModelBackend): | |||||||
|             return Permission.objects.none() |             return Permission.objects.none() | ||||||
|  |  | ||||||
|         qs = Permission.objects.annotate( |         qs = Permission.objects.annotate( | ||||||
|             club=F("role__role__membership__club"), |             club=F("role__membership__club"), | ||||||
|             membership=F("role__role__membership"), |             membership=F("role__membership"), | ||||||
|         ).filter( |         ).filter( | ||||||
|             ( |             ( | ||||||
|                 Q( |                 Q( | ||||||
|                     role__role__membership__date_start__lte=timezone.now().today(), |                     role__membership__date_start__lte=timezone.now().today(), | ||||||
|                     role__role__membership__date_end__gte=timezone.now().today(), |                     role__membership__date_end__gte=timezone.now().today(), | ||||||
|                 ) |                 ) | ||||||
|                 | Q(permanent=True) |                 | Q(permanent=True) | ||||||
|             ) |             ) | ||||||
|             & Q(role__role__membership__user=user) |             & Q(role__membership__user=user) | ||||||
|             & Q(type=t) |             & Q(type=t) | ||||||
|             & Q(mask__rank__lte=get_current_session().get("permission_mask", 0)) |             & Q(mask__rank__lte=get_current_session().get("permission_mask", 0)) | ||||||
|         ) |         ) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user