From bf0afc4fc53c80292e72931d62afe22e7b352a08 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Doderlein Date: Wed, 8 Nov 2023 16:24:29 +0100 Subject: [PATCH] Remove useless permission mask --- apps/member/forms.py | 8 -------- apps/member/views.py | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index aa7e4b6..36927f9 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -19,14 +19,6 @@ from permission.models import PermissionMask, Role from .models import Profile, Club, Membership -class CustomAuthenticationForm(AuthenticationForm): - permission_mask = forms.ModelChoiceField( - label=_("Permission mask"), - queryset=PermissionMask.objects.order_by("rank"), - empty_label=None, - ) - - class UserForm(forms.ModelForm): def _get_validation_exclusions(self): # Django usernames can only contain letters, numbers, @, ., +, - and _. diff --git a/apps/member/views.py b/apps/member/views.py index 6bdcd56..07cb620 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -28,7 +28,7 @@ from permission.models import Role from permission.views import ProtectQuerysetMixin, ProtectedCreateView from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\ - CustomAuthenticationForm, MembershipRolesForm + MembershipRolesForm, AuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable @@ -37,14 +37,14 @@ class CustomLoginView(LoginView): """ Login view, where the user can select its permission mask. """ - form_class = CustomAuthenticationForm + form_class = AuthenticationForm @transaction.atomic def form_valid(self, form): logout(self.request) self.request.user = form.get_user() _set_current_request(self.request) - self.request.session['permission_mask'] = form.cleaned_data['permission_mask'].rank + self.request.session['permission_mask'] = 42#form.cleaned_data['permission_mask'].rank return super().form_valid(form) @@ -269,7 +269,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): "class": "autocomplete form-control", "id": "trusted", "resetable": True, - "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser", + "api_url": "/api/note/alias/", "name_field": "name", "placeholder": "" }