mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 09:12:11 +01:00 
			
		
		
		
	Fix CI
This commit is contained in:
		@@ -2,8 +2,8 @@
 | 
			
		||||
# SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
 | 
			
		||||
from rest_framework.filters import SearchFilter
 | 
			
		||||
 | 
			
		||||
from api.viewsets import ReadProtectedModelViewSet
 | 
			
		||||
 | 
			
		||||
from .serializers import ProfileSerializer, ClubSerializer, RoleSerializer, MembershipSerializer
 | 
			
		||||
from ..models import Profile, Club, Role, Membership
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,15 @@
 | 
			
		||||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 | 
			
		||||
# SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
 | 
			
		||||
from django.contrib.auth.backends import ModelBackend
 | 
			
		||||
from django.contrib.auth.models import User
 | 
			
		||||
from django.contrib.contenttypes.models import ContentType
 | 
			
		||||
from django.db.models import Q, F
 | 
			
		||||
 | 
			
		||||
from note.models import Note, NoteUser, NoteClub, NoteSpecial
 | 
			
		||||
from note_kfet.middlewares import get_current_session
 | 
			
		||||
from permission.models import Permission
 | 
			
		||||
 | 
			
		||||
from .models import Membership, Club
 | 
			
		||||
from django.contrib.auth.backends import ModelBackend
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class PermissionBackend(ModelBackend):
 | 
			
		||||
@@ -53,9 +53,6 @@ class PermissionBackend(ModelBackend):
 | 
			
		||||
        :return: A query that corresponds to the filter to give to a queryset
 | 
			
		||||
        """
 | 
			
		||||
 | 
			
		||||
        from time import time
 | 
			
		||||
        ti = time()
 | 
			
		||||
 | 
			
		||||
        if user.is_superuser and get_current_session().get("permission_mask", 0) >= 42:
 | 
			
		||||
            # Superusers have all rights
 | 
			
		||||
            return Q()
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,8 @@ from dal import autocomplete
 | 
			
		||||
from django import forms
 | 
			
		||||
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 | 
			
		||||
from django.contrib.auth.models import User
 | 
			
		||||
 | 
			
		||||
from permission.models import PermissionMask
 | 
			
		||||
 | 
			
		||||
from .models import Profile, Club, Membership
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -54,7 +54,6 @@ class Profile(models.Model):
 | 
			
		||||
        return reverse('user_detail', args=(self.pk,))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Club(models.Model):
 | 
			
		||||
    """
 | 
			
		||||
    A club is a group of people, whose membership is handle by their
 | 
			
		||||
@@ -164,6 +163,7 @@ class Membership(models.Model):
 | 
			
		||||
        verbose_name_plural = _('memberships')
 | 
			
		||||
        indexes = [models.Index(fields=['user'])]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class RolePermissions(models.Model):
 | 
			
		||||
    """
 | 
			
		||||
    Permissions associated with a Role
 | 
			
		||||
@@ -180,13 +180,3 @@ class RolePermissions(models.Model):
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
        return str(self.role)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# @receiver(post_save, sender=settings.AUTH_USER_MODEL)
 | 
			
		||||
# def save_user_profile(instance, created, **_kwargs):
 | 
			
		||||
#     """
 | 
			
		||||
#     Hook to save an user profile when an user is updated
 | 
			
		||||
#     """
 | 
			
		||||
#     if created:
 | 
			
		||||
#         Profile.objects.create(user=instance)
 | 
			
		||||
#     instance.profile.save()
 | 
			
		||||
 
 | 
			
		||||
@@ -24,8 +24,8 @@ from note.forms import AliasForm, ImageForm
 | 
			
		||||
from note.models import Alias, NoteUser
 | 
			
		||||
from note.models.transactions import Transaction
 | 
			
		||||
from note.tables import HistoryTable, AliasTable
 | 
			
		||||
from .backends import PermissionBackend
 | 
			
		||||
 | 
			
		||||
from .backends import PermissionBackend
 | 
			
		||||
from .filters import UserFilter, UserFilterFormHelper
 | 
			
		||||
from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \
 | 
			
		||||
    CustomAuthenticationForm
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user