jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove useless permission mask

Browse source
This commit is contained in:
Jean-Baptiste Doderlein 2023-11-08 16:24:29 +01:00
parent 6a82a2187e
commit bf0afc4fc5
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/member/forms.py
View file

@ -19,14 +19,6 @@ from permission.models import PermissionMask, Role
from .models import Profile, Club, Membership 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): class UserForm(forms.ModelForm):
def _get_validation_exclusions(self): def _get_validation_exclusions(self):
# Django usernames can only contain letters, numbers, @, ., +, - and _. # Django usernames can only contain letters, numbers, @, ., +, - and _.

8
apps/member/views.py
View file

@ -28,7 +28,7 @@ from permission.models import Role
from permission.views import ProtectQuerysetMixin, ProtectedCreateView from permission.views import ProtectQuerysetMixin, ProtectedCreateView
from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\ from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\
CustomAuthenticationForm, MembershipRolesForm MembershipRolesForm, AuthenticationForm
from .models import Club, Membership from .models import Club, Membership
from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
@ -37,14 +37,14 @@ class CustomLoginView(LoginView):
""" """
Login view, where the user can select its permission mask. Login view, where the user can select its permission mask.
""" """
form_class = CustomAuthenticationForm form_class = AuthenticationForm
@transaction.atomic @transaction.atomic
def form_valid(self, form): def form_valid(self, form):
logout(self.request) logout(self.request)
self.request.user = form.get_user() self.request.user = form.get_user()
_set_current_request(self.request) _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) return super().form_valid(form)
@ -269,7 +269,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
"class": "autocomplete form-control", "class": "autocomplete form-control",
"id": "trusted", "id": "trusted",
"resetable": True, "resetable": True,
"api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser", "api_url": "/api/note/alias/",
"name_field": "name", "name_field": "name",
"placeholder": "" "placeholder": ""
} }