From c384ee02ebfe24e817655f316f901351739e4b40 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 01:03:30 +0200 Subject: [PATCH 01/19] Implement a new type of note (see #45) --- apps/member/forms.py | 28 +++++++- apps/member/urls.py | 16 ++++- apps/member/views.py | 94 ++++++++++++++++++++++--- apps/note/admin.py | 12 +++- apps/note/api/serializers.py | 21 +++++- apps/note/models/notes.py | 36 ++++++++++ apps/note/tables.py | 20 +++++- static/js/base.js | 2 +- templates/member/club_detail.html | 9 +++ templates/member/club_info.html | 7 +- templates/member/noteowner_detail.html | 2 +- templates/note/noteactivity_detail.html | 57 +++++++++++++++ templates/note/noteactivity_form.html | 16 +++++ templates/note/noteactivity_list.html | 27 +++++++ 14 files changed, 326 insertions(+), 21 deletions(-) create mode 100644 templates/note/noteactivity_detail.html create mode 100644 templates/note/noteactivity_form.html create mode 100644 templates/note/noteactivity_list.html diff --git a/apps/member/forms.py b/apps/member/forms.py index 20f0acfe..d731c10c 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -7,7 +7,8 @@ from crispy_forms.layout import Layout from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from note_kfet.inputs import Autocomplete +from note.models.notes import NoteActivity +from note_kfet.inputs import Autocomplete, AmountInput from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -47,6 +48,31 @@ class ClubForm(forms.ModelForm): class Meta: model = Club fields = '__all__' + widgets = { + "membership_fee": AmountInput() + } + + +class NoteActivityForm(forms.ModelForm): + class Meta: + model = NoteActivity + fields = ('note_name', 'club', 'controller', ) + widgets = { + "club": Autocomplete( + Club, + attrs={ + 'api_url': '/api/members/club/', + } + ), + "controller": Autocomplete( + User, + attrs={ + 'api_url': '/api/user/', + 'name_field': 'username', + 'placeholder': 'Nom ...', + } + ) + } class AddMembersForm(forms.Form): diff --git a/apps/member/urls.py b/apps/member/urls.py index 085a3fec..f1a5c2bd 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -8,13 +8,23 @@ from . import views app_name = 'member' urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), + path('club/', views.ClubListView.as_view(), name="club_list"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), path('club/create/', views.ClubCreateView.as_view(), name="club_create"), - path('club//update', views.ClubUpdateView.as_view(), name="club_update"), - path('club//update_pic', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), - path('club//aliases', views.ClubAliasView.as_view(), name="club_alias"), + path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), + path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), + path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), + path('club//linked_notes/', views.ClubLinkedNotesView.as_view(), + name="club_linked_note_list"), + path('club//linked_notes/create/', views.ClubLinkedNoteCreateView.as_view(), + name="club_linked_note_create"), + path('club//linked_notes//', views.ClubLinkedNoteDetailView.as_view(), + name="club_linked_note_detail"), + path('club//linked_notes//update/', views.ClubLinkedNoteUpdateView.as_view(), + name="club_linked_note_update"), + path('user/', views.UserListView.as_view(), name="user_list"), path('user/', views.UserDetailView.as_view(), name="user_detail"), path('user//update', views.UserUpdateView.as_view(), name="user_update_profile"), diff --git a/apps/member/views.py b/apps/member/views.py index 8145b5e9..e8bde67d 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -18,13 +18,14 @@ from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm from note.models import Alias, NoteUser +from note.models.notes import NoteActivity from note.models.transactions import Transaction -from note.tables import HistoryTable, AliasTable +from note.tables import HistoryTable, AliasTable, NoteActivityTable from permission.backends import PermissionBackend from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm + CustomAuthenticationForm, NoteActivityForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -134,7 +135,8 @@ class UserDetailView(LoginRequiredMixin, DetailView): context = super().get_context_data(**kwargs) user = context['user_object'] history_list = \ - Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id") + Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) club_list = \ Membership.objects.all().filter(user=user).only("club") @@ -179,8 +181,8 @@ class ProfileAliasView(LoginRequiredMixin, DetailView): class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView): form_class = ImageForm - def get_context_data(self, *args, **kwargs): - context = super().get_context_data(*args, **kwargs) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) context['form'] = self.form_class(self.request.POST, self.request.FILES) return context @@ -290,8 +292,8 @@ class ClubDetailView(LoginRequiredMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) club = context["club"] - club_transactions = \ - Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note)) + club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) club_member = \ Membership.objects.all().filter(club=club) @@ -317,7 +319,9 @@ class ClubUpdateView(LoginRequiredMixin, UpdateView): context_object_name = "club" form_class = ClubForm template_name = "member/club_form.html" - success_url = reverse_lazy("member:club_detail") + + def get_success_url(self): + return reverse_lazy("member:club_detail", kwargs={"pk": self.object.pk}) class ClubPictureUpdateView(PictureUpdateView): @@ -361,3 +365,77 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): def form_valid(self, formset): formset.save() return super().form_valid(formset) + + +class ClubLinkedNotesView(LoginRequiredMixin, SingleTableView): + model = NoteActivity + table_class = NoteActivityTable + + def get_queryset(self): + return super().get_queryset().filter(club=self.get_object())\ + .filter(PermissionBackend.filter_queryset(self.request.user, NoteActivity, "view")) + + def get_object(self): + if hasattr(self, 'object'): + return self.object + self.object = Club.objects.get(pk=int(self.kwargs["pk"])) + return self.object + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + ctx["object"] = ctx["club"] = self.get_object() + + return ctx + + +class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): + model = NoteActivity + form_class = NoteActivityForm + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + club = Club.objects.get(pk=self.kwargs["club_pk"]) + ctx["object"] = ctx["club"] = club + ctx["form"].fields["club"].initial = club + + return ctx + + def get_success_url(self): + self.object.refresh_from_db() + return reverse_lazy('member:club_linked_note_detail', + kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) + + +class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): + model = NoteActivity + form_class = NoteActivityForm + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + ctx["club"] = Club.objects.get(pk=self.kwargs["club_pk"]) + + return ctx + + def get_success_url(self): + return reverse_lazy('member:club_linked_note_detail', + kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) + + +class ClubLinkedNoteDetailView(LoginRequiredMixin, DetailView): + model = NoteActivity + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + note = NoteActivity.objects.get(pk=self.kwargs["pk"]) + + transactions = Transaction.objects.all().filter(Q(source=note) | Q(destination=note))\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") + ctx['history_list'] = HistoryTable(transactions) + ctx["note"] = note + ctx["club"] = note.club + + return ctx diff --git a/apps/note/admin.py b/apps/note/admin.py index 702d3350..f0dede17 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from polymorphic.admin import PolymorphicChildModelAdmin, \ PolymorphicChildModelFilter, PolymorphicParentModelAdmin -from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser +from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \ RecurrentTransaction, MembershipTransaction @@ -24,7 +24,7 @@ class NoteAdmin(PolymorphicParentModelAdmin): """ Parent regrouping all note types as children """ - child_models = (NoteClub, NoteSpecial, NoteUser) + child_models = (NoteClub, NoteSpecial, NoteUser, NoteActivity) list_filter = ( PolymorphicChildModelFilter, 'is_active', @@ -74,6 +74,14 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin): readonly_fields = ('balance',) +@admin.register(NoteActivity) +class NoteActivityAdmin(PolymorphicChildModelAdmin): + """ + Child for a special note, see NoteAdmin + """ + readonly_fields = ('balance',) + + @admin.register(NoteUser) class NoteUserAdmin(PolymorphicChildModelAdmin): """ diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index fbd12038..a445fef9 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from rest_polymorphic.serializers import PolymorphicSerializer -from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias +from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, NoteActivity from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \ RecurrentTransaction, SpecialTransaction @@ -69,6 +69,22 @@ class NoteUserSerializer(serializers.ModelSerializer): return str(obj) +class NoteActivitySerializer(serializers.ModelSerializer): + """ + REST API Serializer for User's notes. + The djangorestframework plugin will analyse the model `NoteActivity` and parse all fields in the API. + """ + name = serializers.SerializerMethodField() + + class Meta: + model = NoteActivity + fields = '__all__' + read_only_fields = ('note', 'user', ) + + def get_name(self, obj): + return str(obj) + + class AliasSerializer(serializers.ModelSerializer): """ REST API Serializer for Aliases. @@ -90,7 +106,8 @@ class NotePolymorphicSerializer(PolymorphicSerializer): Note: NoteSerializer, NoteUser: NoteUserSerializer, NoteClub: NoteClubSerializer, - NoteSpecial: NoteSpecialSerializer + NoteSpecial: NoteSpecialSerializer, + NoteActivity: NoteActivitySerializer, } class Meta: diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 9282bde9..64ec524f 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -4,11 +4,13 @@ import unicodedata from django.conf import settings +from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.db import models from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel +from member.models import Club """ Defines each note types @@ -174,6 +176,40 @@ class NoteSpecial(Note): return self.special_type +class NoteActivity(Note): + """ + A :model:`note.Note` for accounts that are not attached to a user neither to a club, + that only need to store and transfer money (notes for activities, departments, ...) + """ + + note_name = models.CharField( + verbose_name=_('name'), + max_length=255, + unique=True, + ) + + club = models.ForeignKey( + Club, + on_delete=models.PROTECT, + related_name="linked_notes", + verbose_name=_("club"), + ) + + controller = models.ForeignKey( + User, + on_delete=models.PROTECT, + related_name="+", + verbose_name=_("controller"), + ) + + class Meta: + verbose_name = _("common note") + verbose_name_plural = _("common notes") + + def __str__(self): + return self.note_name + + class Alias(models.Model): """ points toward a :model:`note.NoteUser` or :model;`note.NoteClub` instance. diff --git a/apps/note/tables.py b/apps/note/tables.py index 0d83e3cc..2aba4684 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django.utils.html import format_html from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ -from .models.notes import Alias +from .models.notes import Alias, NoteActivity from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money @@ -121,6 +121,24 @@ class AliasTable(tables.Table): attrs={'td': {'class': 'col-sm-1'}}) +class NoteActivityTable(tables.Table): + note_name = tables.LinkColumn( + "member:club_linked_note_detail", + args=[A("club.pk"), A("pk")], + ) + + def render_balance(self, value): + return pretty_money(value) + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = NoteActivity + fields = ('note_name', 'balance',) + template_name = 'django_tables2/bootstrap4.html' + + class ButtonTable(tables.Table): class Meta: attrs = { diff --git a/static/js/base.js b/static/js/base.js index 22d1366a..7febd3d6 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -70,7 +70,7 @@ function refreshBalance() { * @param fun For each found note with the matched alias `alias`, fun(note, alias) is called. */ function getMatchedNotes(pattern, fun) { - $.getJSON("/api/note/alias/?format=json&alias=" + pattern + "&search=user|club&ordering=normalized_name", fun); + $.getJSON("/api/note/alias/?format=json&alias=" + pattern + "&search=user|club|activity&ordering=normalized_name", fun); } /** diff --git a/templates/member/club_detail.html b/templates/member/club_detail.html index 979c0897..3ad29901 100644 --- a/templates/member/club_detail.html +++ b/templates/member/club_detail.html @@ -7,3 +7,12 @@ {% block profile_content %} {% include "member/club_tables.html" %} {% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 1c8e8661..907914be 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -34,7 +34,10 @@
{{ object.note.alias_set.all|join:", " }}
{% trans 'email'|capfirst %}
-
{{ club.email}}
+
{{ club.email }}
+ +
{% trans 'linked notes'|capfirst %}
+
{{ club.linked_notes.all|join:", " }}
@@ -43,6 +46,6 @@ {% trans "Add roles" %} {% url 'member:club_detail' club.pk as club_detail_url %} {%if request.get_full_path != club_detail_url %} - {% trans 'View Profile' %} + {% trans 'View Profile' %} {% endif %}
diff --git a/templates/member/noteowner_detail.html b/templates/member/noteowner_detail.html index ad329aee..fc781549 100644 --- a/templates/member/noteowner_detail.html +++ b/templates/member/noteowner_detail.html @@ -19,7 +19,7 @@ {% block extrajavascript %} +{% endblock %} diff --git a/templates/note/noteactivity_form.html b/templates/note/noteactivity_form.html new file mode 100644 index 00000000..5088c790 --- /dev/null +++ b/templates/note/noteactivity_form.html @@ -0,0 +1,16 @@ +{% extends "member/noteowner_detail.html" %} + +{% load i18n %} +{% load crispy_forms_tags %} + +{% block profile_info %} +{% include "member/club_info.html" %} +{% endblock %} + +{% block profile_content %} +
+ {% csrf_token %} + {{ form|crispy }} + +
+{% endblock %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html new file mode 100644 index 00000000..b4d69536 --- /dev/null +++ b/templates/note/noteactivity_list.html @@ -0,0 +1,27 @@ +{% extends "member/noteowner_detail.html" %} + +{% load i18n %} +{% load render_table from django_tables2 %} + +{% block profile_info %} +{% include "member/club_info.html" %} +{% endblock %} + +{% block profile_content %} +
+
+
+
+
{% trans "linked notes of club"|capfirst %} {{ club.name }}
+
+
+ {% render_table table %} +
+
+ + + + +
+
+{% endblock %} From 1aae18e6a66f0bd2993dec89fdc97ff2724be7ce Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 04:16:30 +0200 Subject: [PATCH 02/19] Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) --- apps/activity/views.py | 24 +++-- apps/member/forms.py | 8 +- apps/member/views.py | 83 +++++++-------- apps/note/models/__init__.py | 4 +- apps/note/views.py | 30 +++--- apps/permission/backends.py | 5 +- apps/permission/fixtures/initial.json | 134 ++++++++++++++++++++++-- apps/permission/models.py | 17 ++- apps/permission/views.py | 11 ++ apps/treasury/forms.py | 4 +- apps/treasury/views.py | 40 ++++--- templates/note/noteactivity_detail.html | 9 +- templates/note/noteactivity_list.html | 8 +- 13 files changed, 272 insertions(+), 105 deletions(-) create mode 100644 apps/permission/views.py diff --git a/apps/activity/views.py b/apps/activity/views.py index feb7591d..51e2ebf5 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,5 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later + from datetime import datetime, timezone from django.contrib.auth.mixins import LoginRequiredMixin @@ -11,13 +12,14 @@ from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView from note.models import NoteUser, Alias, NoteSpecial from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import ActivityForm, GuestForm from .models import Activity, Guest, Entry from .tables import ActivityTable, GuestTable, EntryTable -class ActivityCreateView(LoginRequiredMixin, CreateView): +class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm @@ -30,13 +32,12 @@ class ActivityCreateView(LoginRequiredMixin, CreateView): return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk}) -class ActivityListView(LoginRequiredMixin, SingleTableView): +class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): model = Activity table_class = ActivityTable def get_queryset(self): - return super().get_queryset()\ - .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).reverse() + return super().get_queryset().reverse() def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) @@ -50,7 +51,7 @@ class ActivityListView(LoginRequiredMixin, SingleTableView): return ctx -class ActivityDetailView(LoginRequiredMixin, DetailView): +class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Activity context_object_name = "activity" @@ -66,7 +67,7 @@ class ActivityDetailView(LoginRequiredMixin, DetailView): return ctx -class ActivityUpdateView(LoginRequiredMixin, UpdateView): +class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = Activity form_class = ActivityForm @@ -74,18 +75,20 @@ class ActivityUpdateView(LoginRequiredMixin, UpdateView): return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) -class ActivityInviteView(LoginRequiredMixin, CreateView): +class ActivityInviteView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Guest form_class = GuestForm template_name = "activity/activity_invite.html" def get_form(self, form_class=None): form = super().get_form(form_class) - form.activity = Activity.objects.get(pk=self.kwargs["pk"]) + form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ + .get(pk=self.kwargs["pk"]) return form def form_valid(self, form): - form.instance.activity = Activity.objects.get(pk=self.kwargs["pk"]) + form.instance.activity = Activity.objects\ + .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).get(pk=self.kwargs["pk"]) return super().form_valid(form) def get_success_url(self, **kwargs): @@ -98,7 +101,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - activity = Activity.objects.get(pk=self.kwargs["pk"]) + activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ + .get(pk=self.kwargs["pk"]) ctx["activity"] = activity matched = [] diff --git a/apps/member/forms.py b/apps/member/forms.py index d731c10c..9c25f2c2 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -49,7 +49,13 @@ class ClubForm(forms.ModelForm): model = Club fields = '__all__' widgets = { - "membership_fee": AmountInput() + "membership_fee": AmountInput(), + "parent_club": Autocomplete( + Club, + attrs={ + 'api_url': '/api/members/club/', + } + ), } diff --git a/apps/member/views.py b/apps/member/views.py index e8bde67d..932899ff 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -22,6 +22,7 @@ from note.models.notes import NoteActivity from note.models.transactions import Transaction from note.tables import HistoryTable, AliasTable, NoteActivityTable from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ @@ -64,7 +65,7 @@ class UserCreateView(CreateView): return super().form_valid(form) -class UserUpdateView(LoginRequiredMixin, UpdateView): +class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = User fields = ['first_name', 'last_name', 'username', 'email'] template_name = 'member/profile_update.html' @@ -98,7 +99,8 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): if form.is_valid() and profile_form.is_valid(): new_username = form.data['username'] alias = Alias.objects.filter(name=new_username) - # Si le nouveau pseudo n'est pas un de nos alias, on supprime éventuellement un alias similaire pour le remplacer + # Si le nouveau pseudo n'est pas un de nos alias, + # on supprime éventuellement un alias similaire pour le remplacer if not alias.exists(): similar = Alias.objects.filter( normalized_name=Alias.normalize(new_username)) @@ -120,7 +122,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): return reverse_lazy('member:user_detail', args=(self.object.id,)) -class UserDetailView(LoginRequiredMixin, DetailView): +class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ Affiche les informations sur un utilisateur, sa note, ses clubs... """ @@ -128,9 +130,6 @@ class UserDetailView(LoginRequiredMixin, DetailView): context_object_name = "user_object" template_name = "member/profile_detail.html" - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, User, "view")) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) user = context['user_object'] @@ -138,13 +137,13 @@ class UserDetailView(LoginRequiredMixin, DetailView): Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) - club_list = \ - Membership.objects.all().filter(user=user).only("club") + club_list = Membership.objects.all().filter(user=user)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") context['club_list'] = ClubTable(club_list) return context -class UserListView(LoginRequiredMixin, SingleTableView): +class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ Affiche la liste des utilisateurs, avec une fonction de recherche statique """ @@ -155,7 +154,7 @@ class UserListView(LoginRequiredMixin, SingleTableView): formhelper_class = UserFilterFormHelper def get_queryset(self, **kwargs): - qs = super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, User, "view")) + qs = super().get_queryset() self.filter = self.filter_class(self.request.GET, queryset=qs) self.filter.form.helper = self.formhelper_class() return self.filter.qs @@ -166,7 +165,7 @@ class UserListView(LoginRequiredMixin, SingleTableView): return context -class ProfileAliasView(LoginRequiredMixin, DetailView): +class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = User template_name = 'member/profile_alias.html' context_object_name = 'user_object' @@ -178,7 +177,7 @@ class ProfileAliasView(LoginRequiredMixin, DetailView): return context -class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView): +class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView): form_class = ImageForm def get_context_data(self, **kwargs): @@ -239,8 +238,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): template_name = "member/manage_auth_tokens.html" def get(self, request, *args, **kwargs): - if 'regenerate' in request.GET and Token.objects.filter( - user=request.user).exists(): + if 'regenerate' in request.GET and Token.objects.filter(user=request.user).exists(): Token.objects.get(user=self.request.user).delete() return redirect(reverse_lazy('member:auth_token') + "?show", permanent=True) @@ -249,8 +247,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['token'] = Token.objects.get_or_create( - user=self.request.user)[0] + context['token'] = Token.objects.get_or_create(user=self.request.user)[0] return context @@ -259,7 +256,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): # ******************************* # -class ClubCreateView(LoginRequiredMixin, CreateView): +class ClubCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Club """ @@ -271,38 +268,32 @@ class ClubCreateView(LoginRequiredMixin, CreateView): return super().form_valid(form) -class ClubListView(LoginRequiredMixin, SingleTableView): +class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List existing Clubs """ model = Club table_class = ClubTable - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) - -class ClubDetailView(LoginRequiredMixin, DetailView): +class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Club context_object_name = "club" - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) club = context["club"] club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) - club_member = \ - Membership.objects.all().filter(club=club) + club_member = Membership.objects.filter(club=club)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() # TODO: consider only valid Membership context['member_list'] = club_member return context -class ClubAliasView(LoginRequiredMixin, DetailView): +class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Club template_name = 'member/club_alias.html' context_object_name = 'club' @@ -314,7 +305,7 @@ class ClubAliasView(LoginRequiredMixin, DetailView): return context -class ClubUpdateView(LoginRequiredMixin, UpdateView): +class ClubUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = Club context_object_name = "club" form_class = ClubForm @@ -333,7 +324,7 @@ class ClubPictureUpdateView(PictureUpdateView): return reverse_lazy('member:club_detail', kwargs={'pk': self.object.id}) -class ClubAddMemberView(LoginRequiredMixin, CreateView): +class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Membership form_class = MembershipForm template_name = 'member/add_members.html' @@ -344,7 +335,8 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): "change")) def get_context_data(self, **kwargs): - club = Club.objects.get(pk=self.kwargs["pk"]) + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) context['formset'] = MemberFormSet() context['helper'] = FormSetHelper() @@ -367,36 +359,40 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): return super().form_valid(formset) -class ClubLinkedNotesView(LoginRequiredMixin, SingleTableView): +class ClubLinkedNotesView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): model = NoteActivity table_class = NoteActivityTable def get_queryset(self): - return super().get_queryset().filter(club=self.get_object())\ - .filter(PermissionBackend.filter_queryset(self.request.user, NoteActivity, "view")) + return super().get_queryset().filter(club=self.get_object()) def get_object(self): if hasattr(self, 'object'): return self.object - self.object = Club.objects.get(pk=int(self.kwargs["pk"])) + self.object = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=int(self.kwargs["pk"])) return self.object def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["object"] = ctx["club"] = self.get_object() + club = ctx["object"] = ctx["club"] = self.get_object() + + empty_note = NoteActivity(note_name="", club=club, controller=self.request.user) + ctx["can_create"] = PermissionBackend().has_perm(self.request.user, "note.add_noteactivity", empty_note) return ctx -class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): +class ClubLinkedNoteCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = NoteActivity form_class = NoteActivityForm def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - club = Club.objects.get(pk=self.kwargs["club_pk"]) + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["club_pk"]) ctx["object"] = ctx["club"] = club ctx["form"].fields["club"].initial = club @@ -408,14 +404,15 @@ class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) -class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): +class ClubLinkedNoteUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = NoteActivity form_class = NoteActivityForm def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["club"] = Club.objects.get(pk=self.kwargs["club_pk"]) + ctx["club"] = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["club_pk"]) return ctx @@ -424,15 +421,15 @@ class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) -class ClubLinkedNoteDetailView(LoginRequiredMixin, DetailView): +class ClubLinkedNoteDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = NoteActivity def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - note = NoteActivity.objects.get(pk=self.kwargs["pk"]) + note = self.get_queryset().filter(pk=self.kwargs["pk"]).get() - transactions = Transaction.objects.all().filter(Q(source=note) | Q(destination=note))\ + transactions = Transaction.objects.filter(Q(source=note) | Q(destination=note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") ctx['history_list'] = HistoryTable(transactions) ctx["note"] = note diff --git a/apps/note/models/__init__.py b/apps/note/models/__init__.py index e9c8a0a9..dd024963 100644 --- a/apps/note/models/__init__.py +++ b/apps/note/models/__init__.py @@ -1,13 +1,13 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser +from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity from .transactions import MembershipTransaction, Transaction, \ TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction __all__ = [ # Notes - 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', + 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', 'NoteActivity', # Transactions 'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate', 'RecurrentTransaction', 'SpecialTransaction', diff --git a/apps/note/views.py b/apps/note/views.py index 25279281..ac9b3e40 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -9,6 +9,7 @@ from django_tables2 import SingleTableView from django.urls import reverse_lazy from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import TransactionTemplateForm from .models import Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial @@ -16,7 +17,7 @@ from .models.transactions import SpecialTransaction from .tables import HistoryTable, ButtonTable -class TransactionCreateView(LoginRequiredMixin, SingleTableView): +class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ View for the creation of Transaction between two note which are not :models:`transactions.RecurrentTransaction`. e.g. for donation/transfer between people and clubs or for credit/debit with :models:`note.NoteSpecial` @@ -26,12 +27,9 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): model = Transaction # Transaction history table table_class = HistoryTable - table_pagination = {"per_page": 50} - def get_queryset(self): - return Transaction.objects.filter(PermissionBackend.filter_queryset( - self.request.user, Transaction, "view") - ).order_by("-id").all()[:50] + def get_queryset(self, **kwargs): + return super().get_queryset(**kwargs).order_by("-id").all()[:50] def get_context_data(self, **kwargs): """ @@ -42,12 +40,14 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): context['amount_widget'] = AmountInput(attrs={"id": "amount"}) context['polymorphic_ctype'] = ContentType.objects.get_for_model(Transaction).pk context['special_polymorphic_ctype'] = ContentType.objects.get_for_model(SpecialTransaction).pk - context['special_types'] = NoteSpecial.objects.order_by("special_type").all() + context['special_types'] = NoteSpecial.objects\ + .filter(PermissionBackend.filter_queryset(self.request.user, NoteSpecial, "view"))\ + .order_by("special_type").all() return context -class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): +class TransactionTemplateCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create TransactionTemplate """ @@ -56,7 +56,7 @@ class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): success_url = reverse_lazy('note:template_list') -class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): +class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List TransactionsTemplates """ @@ -64,7 +64,7 @@ class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): table_class = ButtonTable -class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): +class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ """ model = TransactionTemplate @@ -72,21 +72,19 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): success_url = reverse_lazy('note:template_list') -class ConsoView(LoginRequiredMixin, SingleTableView): +class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ The Magic View that make people pay their beer and burgers. (Most of the magic happens in the dark world of Javascript see consos.js) """ + model = Transaction template_name = "note/conso_form.html" # Transaction history table table_class = HistoryTable - table_pagination = {"per_page": 50} - def get_queryset(self): - return Transaction.objects.filter( - PermissionBackend.filter_queryset(self.request.user, Transaction, "view") - ).order_by("-id").all()[:50] + def get_queryset(self, **kwargs): + return super().get_queryset(**kwargs).order_by("-id").all()[:50] def get_context_data(self, **kwargs): """ diff --git a/apps/permission/backends.py b/apps/permission/backends.py index e61b0719..f838fc1f 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -5,7 +5,7 @@ from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.db.models import Q, F -from note.models import Note, NoteUser, NoteClub, NoteSpecial +from note.models import Note, NoteUser, NoteClub, NoteSpecial, NoteActivity from note_kfet.middlewares import get_current_session from member.models import Membership, Club @@ -35,7 +35,7 @@ class PermissionBackend(ModelBackend): model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): - if not isinstance(model, permission.model.__class__): + if not isinstance(model, permission.model.__class__) or not permission.club: continue club = Club.objects.get(pk=permission.club) @@ -49,6 +49,7 @@ class PermissionBackend(ModelBackend): NoteUser=NoteUser, NoteClub=NoteClub, NoteSpecial=NoteSpecial, + NoteActivity=NoteActivity, F=F, Q=Q ) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 31b59069..e0430530 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -176,7 +176,7 @@ "note", "alias" ], - "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]", + "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}, {\"note__in\": [\"NoteActivity\", \"objects\", [\"all\"]]}]", "type": "view", "mask": 1, "field": "", @@ -386,7 +386,7 @@ "note", "transaction" ], - "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}]", + "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, "field": "", @@ -783,6 +783,111 @@ "description": "Validate invitation transactions" } }, + { + "model": "permission.permission", + "pk": 47, + "fields": { + "model": [ + "member", + "club" + ], + "query": "{\"pk\": [\"club\", \"pk\"]}", + "type": "change", + "mask": 1, + "field": "", + "description": "Update club" + } + }, + { + "model": "permission.permission", + "pk": 48, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"club\": [\"club\"]}", + "type": "change", + "mask": 1, + "field": "", + "description": "Manage notes that are linked to a club" + } + }, + { + "model": "permission.permission", + "pk": 49, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"club\": [\"club\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View notes that are linked to a club" + } + }, + { + "model": "permission.permission", + "pk": 50, + "fields": { + "model": [ + "note", + "transaction" + ], + "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", + "type": "add", + "mask": 2, + "field": "", + "description": "Add transactions linked to a noteactivity" + } + }, + { + "model": "permission.permission", + "pk": 51, + "fields": { + "model": [ + "note", + "transaction" + ], + "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}]]", + "type": "view", + "mask": 1, + "field": "", + "description": "View transactions linked to a noteactivity" + } + }, + { + "model": "permission.permission", + "pk": 52, + "fields": { + "model": [ + "note", + "note" + ], + "query": "{\"noteactivity__controller\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View note activity" + } + }, + { + "model": "permission.permission", + "pk": 53, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"controller\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View note activity" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -810,7 +915,6 @@ 3, 4, 5, - 6, 7, 8, 9, @@ -827,7 +931,12 @@ 35, 36, 39, - 40 + 40, + 6, + 52, + 53, + 51, + 50 ] } }, @@ -838,9 +947,9 @@ "role": 8, "permissions": [ 19, - 20, 21, - 22 + 22, + 20 ] } }, @@ -880,5 +989,18 @@ 46 ] } + }, + { + "model": "permission.rolepermissions", + "pk": 6, + "fields": { + "role": 7, + "permissions": [ + 22, + 47, + 48, + 49 + ] + } } ] diff --git a/apps/permission/models.py b/apps/permission/models.py index 205f5b41..d1b55090 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -38,20 +38,29 @@ class InstancedPermission: if permission_type == self.type: self.update_query() - # Don't increase indexes - obj.pk = 0 + # Don't increase indexes, if the primary key is an AutoField + if not hasattr(obj, "pk") or not obj.pk: + obj.pk = 0 + oldpk = None + else: + oldpk = obj.pk + # Ensure previous models are deleted + self.model.model_class().objects.filter(pk=obj.pk).delete() # Force insertion, no data verification, no trigger Model.save(obj, force_insert=True) - ret = obj in self.model.model_class().objects.filter(self.query).all() + ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object Model.delete(obj) + + # If the primary key was specified, we restore it + obj.pk = oldpk return ret if permission_type == self.type: if self.field and field_name != self.field: return False self.update_query() - return obj in self.model.model_class().objects.filter(self.query).all() + return self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() else: return False diff --git a/apps/permission/views.py b/apps/permission/views.py new file mode 100644 index 00000000..bbd9872f --- /dev/null +++ b/apps/permission/views.py @@ -0,0 +1,11 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from permission.backends import PermissionBackend + + +class ProtectQuerysetMixin: + def get_queryset(self, **kwargs): + qs = super().get_queryset(**kwargs) + + return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")) diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index 7fe7de4c..ad479e14 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -8,6 +8,7 @@ from crispy_forms.layout import Submit from django import forms from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import DatePickerInput, AmountInput +from permission.backends import PermissionBackend from .models import Invoice, Product, Remittance, SpecialTransactionProxy @@ -131,7 +132,8 @@ class LinkTransactionToRemittanceForm(forms.ModelForm): # Add submit button self.helper.add_input(Submit('submit', _("Submit"), attr={'class': 'btn btn-block btn-primary'})) - self.fields["remittance"].queryset = Remittance.objects.filter(closed=False) + self.fields["remittance"].queryset = Remittance.objects.filter(closed=False)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) def clean_last_name(self): """ diff --git a/apps/treasury/views.py b/apps/treasury/views.py index c374ced1..adf38aaa 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -19,13 +19,15 @@ from django.views.generic.base import View, TemplateView from django_tables2 import SingleTableView from note.models import SpecialTransaction, NoteSpecial from note_kfet.settings.base import BASE_DIR +from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import InvoiceForm, ProductFormSet, ProductFormSetHelper, RemittanceForm, LinkTransactionToRemittanceForm from .models import Invoice, Product, Remittance, SpecialTransactionProxy from .tables import InvoiceTable, RemittanceTable, SpecialTransactionTable -class InvoiceCreateView(LoginRequiredMixin, CreateView): +class InvoiceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Invoice """ @@ -67,7 +69,7 @@ class InvoiceCreateView(LoginRequiredMixin, CreateView): return reverse_lazy('treasury:invoice_list') -class InvoiceListView(LoginRequiredMixin, SingleTableView): +class InvoiceListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List existing Invoices """ @@ -75,7 +77,7 @@ class InvoiceListView(LoginRequiredMixin, SingleTableView): table_class = InvoiceTable -class InvoiceUpdateView(LoginRequiredMixin, UpdateView): +class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Create Invoice """ @@ -130,7 +132,7 @@ class InvoiceRenderView(LoginRequiredMixin, View): def get(self, request, **kwargs): pk = kwargs["pk"] - invoice = Invoice.objects.get(pk=pk) + invoice = Invoice.objects.filter(PermissionBackend.filter_queryset(request.user, Invoice, "view")).get(pk=pk) products = Product.objects.filter(invoice=invoice).all() # Informations of the BDE. Should be updated when the school will move. @@ -188,7 +190,7 @@ class InvoiceRenderView(LoginRequiredMixin, View): return response -class RemittanceCreateView(LoginRequiredMixin, CreateView): +class RemittanceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Remittance """ @@ -201,7 +203,9 @@ class RemittanceCreateView(LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.all()) + ctx["table"] = RemittanceTable(data=Remittance.objects + .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) + .all()) ctx["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) return ctx @@ -216,22 +220,28 @@ class RemittanceListView(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["opened_remittances"] = RemittanceTable(data=Remittance.objects.filter(closed=False).all()) - ctx["closed_remittances"] = RemittanceTable(data=Remittance.objects.filter(closed=True).reverse().all()) + ctx["opened_remittances"] = RemittanceTable( + data=Remittance.objects.filter(closed=False).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + ctx["closed_remittances"] = RemittanceTable( + data=Remittance.objects.filter(closed=True).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all()) ctx["special_transactions_no_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), - specialtransactionproxy__remittance=None).all(), + specialtransactionproxy__remittance=None).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_remove', )) ctx["special_transactions_with_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), - specialtransactionproxy__remittance__closed=False).all(), + specialtransactionproxy__remittance__closed=False).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_add', )) return ctx -class RemittanceUpdateView(LoginRequiredMixin, UpdateView): +class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Update Remittance """ @@ -244,8 +254,10 @@ class RemittanceUpdateView(LoginRequiredMixin, UpdateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.all()) - data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).all() + ctx["table"] = RemittanceTable(data=Remittance.objects.filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() ctx["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) @@ -253,7 +265,7 @@ class RemittanceUpdateView(LoginRequiredMixin, UpdateView): return ctx -class LinkTransactionToRemittanceView(LoginRequiredMixin, UpdateView): +class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Attach a special transaction to a remittance """ diff --git a/templates/note/noteactivity_detail.html b/templates/note/noteactivity_detail.html index 731707f6..aab9e055 100644 --- a/templates/note/noteactivity_detail.html +++ b/templates/note/noteactivity_detail.html @@ -3,6 +3,7 @@ {% load i18n %} {% load render_table from django_tables2 %} {% load pretty_money %} +{% load perms %} {% block profile_info %} {% include "member/club_info.html" %} @@ -25,9 +26,11 @@
{{ note.balance|pretty_money }}
-
- {% trans "Edit" %} -
+ {% if "change_"|has_perm:note %} +
+ {% trans "Edit" %} +
+ {% endif %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html index b4d69536..3cd5b786 100644 --- a/templates/note/noteactivity_list.html +++ b/templates/note/noteactivity_list.html @@ -19,9 +19,11 @@ - - - + {% if can_create %} + + + + {% endif %} {% endblock %} From 12945945bc57308e568f05a49459285b985d3917 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 14:10:30 +0200 Subject: [PATCH 03/19] Update translations --- apps/note/models/notes.py | 4 +- apps/treasury/views.py | 4 +- locale/de/LC_MESSAGES/django.po | 162 +++++++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 165 ++++++++++++++++++++------------ 4 files changed, 206 insertions(+), 129 deletions(-) diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 64ec524f..1228ca00 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -203,8 +203,8 @@ class NoteActivity(Note): ) class Meta: - verbose_name = _("common note") - verbose_name_plural = _("common notes") + verbose_name = _("activity note") + verbose_name_plural = _("activity notes") def __str__(self): return self.note_name diff --git a/apps/treasury/views.py b/apps/treasury/views.py index adf38aaa..f564ccb2 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -255,9 +255,9 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView) ctx = super().get_context_data(**kwargs) ctx["table"] = RemittanceTable(data=Remittance.objects.filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() ctx["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e2c8075e..c83bf321 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-30 17:31+0200\n" +"POT-Creation-Date: 2020-03-31 04:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,9 +45,10 @@ msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 -#: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 +#: apps/note/models/transactions.py:24 apps/note/models/transactions.py:44 +#: apps/note/models/transactions.py:231 templates/member/club_info.html:13 +#: templates/member/profile_info.html:14 msgid "name" msgstr "" @@ -68,18 +69,18 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:60 apps/note/models/notes.py:164 +#: apps/activity/models.py:60 apps/note/models/notes.py:166 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:117 +#: apps/note/models/notes.py:119 msgid "user" msgstr "" @@ -88,7 +89,7 @@ msgid "organizer" msgstr "" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/note/models/notes.py:60 msgid "note" msgstr "" @@ -169,16 +170,16 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +#: apps/activity/tables.py:77 apps/treasury/forms.py:121 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: apps/activity/tables.py:79 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:92 msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "" @@ -186,11 +187,11 @@ msgstr "" msgid "Balance" msgstr "" -#: apps/activity/views.py:44 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:94 msgid "Activities" msgstr "" -#: apps/activity/views.py:149 +#: apps/activity/views.py:153 msgid "Entry for activity \"{}\"" msgstr "" @@ -226,12 +227,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 msgid "delete" msgstr "" @@ -313,7 +314,8 @@ msgid "" "members can renew their membership." msgstr "" -#: apps/member/models.py:104 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:141 +#: apps/note/models/notes.py:195 msgid "club" msgstr "" @@ -321,7 +323,7 @@ msgstr "" msgid "clubs" msgstr "" -#: apps/member/models.py:128 apps/permission/models.py:275 +#: apps/member/models.py:128 apps/permission/models.py:284 msgid "role" msgstr "" @@ -353,19 +355,19 @@ msgstr "" msgid "memberships" msgstr "" -#: apps/member/views.py:76 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:89 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "" -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:128 apps/note/models/transactions.py:94 msgid "source" msgstr "" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:136 apps/note/admin.py:164 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -378,104 +380,116 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 msgid "created at" msgstr "" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:123 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:124 msgid "users note" msgstr "" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:130 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:145 msgid "club note" msgstr "" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:146 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:152 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:172 msgid "special note" msgstr "" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:173 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 +msgid "controller" +msgstr "" + +#: apps/note/models/notes.py:206 +msgid "activity note" +msgstr "" + +#: apps/note/models/notes.py:207 +msgid "activity notes" +msgstr "" + +#: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:246 msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:247 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:269 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:274 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:287 msgid "You can't delete your main alias." msgstr "" @@ -578,29 +592,29 @@ msgstr "" msgid "No reason specified" msgstr "" -#: apps/note/views.py:41 +#: apps/note/views.py:39 msgid "Transfer money" msgstr "" -#: apps/note/views.py:102 templates/base.html:79 +#: apps/note/views.py:100 templates/base.html:79 msgid "Consumptions" msgstr "" -#: apps/permission/models.py:69 apps/permission/models.py:262 +#: apps/permission/models.py:78 apps/permission/models.py:271 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:71 apps/permission/models.py:264 +#: apps/permission/models.py:80 apps/permission/models.py:273 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:84 +#: apps/permission/models.py:93 msgid "rank" msgstr "" -#: apps/permission/models.py:147 +#: apps/permission/models.py:156 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -608,31 +622,32 @@ msgstr "" msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 templates/treasury/invoice_form.html:46 +#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:87 msgid "Close" msgstr "" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:96 msgid "Remittance is already closed." msgstr "" -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:101 msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:98 msgid "Bank" msgstr "" -#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -879,19 +894,24 @@ msgstr "" msgid "Club Parent" msgstr "" -#: templates/member/club_info.html:41 +#: templates/member/club_info.html:39 +msgid "linked notes" +msgstr "" + +#: templates/member/club_info.html:44 msgid "Add member" msgstr "" -#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:46 msgid "Add roles" msgstr "" -#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +#: templates/member/club_info.html:49 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" @@ -912,6 +932,7 @@ msgid "Member of the Club" msgstr "" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "" @@ -944,6 +965,7 @@ msgid "Change password" msgstr "" #: templates/member/profile_info.html:33 +#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "" @@ -992,6 +1014,22 @@ msgstr "" msgid "Recent transactions history" msgstr "" +#: templates/note/noteactivity_detail.html:15 +msgid "Linked note:" +msgstr "" + +#: templates/note/noteactivity_detail.html:19 +msgid "attached club" +msgstr "" + +#: templates/note/noteactivity_list.html:15 +msgid "linked notes of club" +msgstr "" + +#: templates/note/noteactivity_list.html:24 +msgid "Add new note" +msgstr "" + #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 08c1b174..cd01499d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-30 17:31+0200\n" +"POT-Creation-Date: 2020-03-31 04:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,8 @@ msgstr "activité" #: apps/activity/forms.py:45 apps/activity/models.py:217 msgid "You can't invite someone once the activity is started." -msgstr "Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré." +msgstr "" +"Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré." #: apps/activity/forms.py:48 apps/activity/models.py:220 msgid "This activity is not validated yet." @@ -40,9 +41,10 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 -#: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 +#: apps/note/models/transactions.py:24 apps/note/models/transactions.py:44 +#: apps/note/models/transactions.py:231 templates/member/club_info.html:13 +#: templates/member/profile_info.html:14 msgid "name" msgstr "nom" @@ -63,18 +65,18 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:60 apps/note/models/notes.py:164 +#: apps/activity/models.py:60 apps/note/models/notes.py:166 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:117 +#: apps/note/models/notes.py:119 msgid "user" msgstr "utilisateur" @@ -83,7 +85,7 @@ msgid "organizer" msgstr "organisateur" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/note/models/notes.py:60 msgid "note" msgstr "note" @@ -164,16 +166,16 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +#: apps/activity/tables.py:77 apps/treasury/forms.py:121 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: apps/activity/tables.py:79 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:92 msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "Note" @@ -181,11 +183,11 @@ msgstr "Note" msgid "Balance" msgstr "Solde du compte" -#: apps/activity/views.py:44 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:94 msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:149 +#: apps/activity/views.py:153 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -221,12 +223,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 msgid "delete" msgstr "Supprimer" @@ -312,7 +314,8 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:104 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:141 +#: apps/note/models/notes.py:195 msgid "club" msgstr "club" @@ -320,7 +323,7 @@ msgstr "club" msgid "clubs" msgstr "clubs" -#: apps/member/models.py:128 apps/permission/models.py:275 +#: apps/member/models.py:128 apps/permission/models.py:284 msgid "role" msgstr "rôle" @@ -352,19 +355,19 @@ msgstr "adhésion" msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:76 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:89 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:128 apps/note/models/transactions.py:94 msgid "source" msgstr "source" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:136 apps/note/admin.py:164 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -377,105 +380,117 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "dernier date de négatif" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:123 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:124 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:130 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:145 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:146 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:152 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:172 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:173 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 +msgid "controller" +msgstr "contrôleur" + +#: apps/note/models/notes.py:206 +msgid "activity note" +msgstr "note d'activité" + +#: apps/note/models/notes.py:207 +msgid "activity notes" +msgstr "notes d'activité" + +#: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:246 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:247 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:269 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:274 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:287 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -578,29 +593,29 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/views.py:41 +#: apps/note/views.py:39 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:102 templates/base.html:79 +#: apps/note/views.py:100 templates/base.html:79 msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:69 apps/permission/models.py:262 +#: apps/permission/models.py:78 apps/permission/models.py:271 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:71 apps/permission/models.py:264 +#: apps/permission/models.py:80 apps/permission/models.py:273 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:84 +#: apps/permission/models.py:93 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:147 +#: apps/permission/models.py:156 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -608,31 +623,32 @@ msgstr "" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 templates/treasury/invoice_form.html:46 +#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:87 msgid "Close" msgstr "Fermer" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:96 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:101 msgid "You can't change the type of the remittance." msgstr "Vous ne pouvez pas changer le type de la remise." -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:98 msgid "Bank" msgstr "Banque" -#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -881,19 +897,24 @@ msgstr "Ajouter un alias" msgid "Club Parent" msgstr "Club parent" -#: templates/member/club_info.html:41 +#: templates/member/club_info.html:39 +msgid "linked notes" +msgstr "notes liées" + +#: templates/member/club_info.html:44 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:46 msgid "Add roles" msgstr "Ajouter des rôles" -#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +#: templates/member/club_info.html:49 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -914,6 +935,7 @@ msgid "Member of the Club" msgstr "Membre du club" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "Historique des transactions" @@ -946,6 +968,7 @@ msgid "Change password" msgstr "Changer le mot de passe" #: templates/member/profile_info.html:33 +#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "solde du compte" @@ -994,6 +1017,22 @@ msgstr "Consommations doubles" msgid "Recent transactions history" msgstr "Historique des transactions récentes" +#: templates/note/noteactivity_detail.html:15 +msgid "Linked note:" +msgstr "note attachée :" + +#: templates/note/noteactivity_detail.html:19 +msgid "attached club" +msgstr "club lié" + +#: templates/note/noteactivity_list.html:15 +msgid "linked notes of club" +msgstr "Notes liées au club" + +#: templates/note/noteactivity_list.html:24 +msgid "Add new note" +msgstr "Ajouter une note" + #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "Don" From dd3b7bd7e5ab6a5c598e8f1afdece81516bfc14e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 14:57:44 +0200 Subject: [PATCH 04/19] Remove note activities --- apps/member/forms.py | 23 ----- apps/member/urls.py | 8 -- apps/member/views.py | 84 +------------------ apps/note/admin.py | 12 +-- apps/note/api/serializers.py | 19 +---- apps/note/models/__init__.py | 4 +- apps/note/models/notes.py | 36 -------- apps/note/tables.py | 20 +---- apps/permission/backends.py | 3 +- apps/permission/fixtures/initial.json | 106 ++---------------------- locale/de/LC_MESSAGES/django.po | 33 +------- locale/fr/LC_MESSAGES/django.po | 33 +------- templates/note/noteactivity_detail.html | 60 -------------- templates/note/noteactivity_form.html | 16 ---- templates/note/noteactivity_list.html | 29 ------- 15 files changed, 16 insertions(+), 470 deletions(-) delete mode 100644 templates/note/noteactivity_detail.html delete mode 100644 templates/note/noteactivity_form.html delete mode 100644 templates/note/noteactivity_list.html diff --git a/apps/member/forms.py b/apps/member/forms.py index 9c25f2c2..80c2b49e 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -7,7 +7,6 @@ from crispy_forms.layout import Layout from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from note.models.notes import NoteActivity from note_kfet.inputs import Autocomplete, AmountInput from permission.models import PermissionMask @@ -59,28 +58,6 @@ class ClubForm(forms.ModelForm): } -class NoteActivityForm(forms.ModelForm): - class Meta: - model = NoteActivity - fields = ('note_name', 'club', 'controller', ) - widgets = { - "club": Autocomplete( - Club, - attrs={ - 'api_url': '/api/members/club/', - } - ), - "controller": Autocomplete( - User, - attrs={ - 'api_url': '/api/user/', - 'name_field': 'username', - 'placeholder': 'Nom ...', - } - ) - } - - class AddMembersForm(forms.Form): class Meta: fields = ('',) diff --git a/apps/member/urls.py b/apps/member/urls.py index f1a5c2bd..7f4bf0d5 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -16,14 +16,6 @@ urlpatterns = [ path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), - path('club//linked_notes/', views.ClubLinkedNotesView.as_view(), - name="club_linked_note_list"), - path('club//linked_notes/create/', views.ClubLinkedNoteCreateView.as_view(), - name="club_linked_note_create"), - path('club//linked_notes//', views.ClubLinkedNoteDetailView.as_view(), - name="club_linked_note_detail"), - path('club//linked_notes//update/', views.ClubLinkedNoteUpdateView.as_view(), - name="club_linked_note_update"), path('user/', views.UserListView.as_view(), name="user_list"), path('user/', views.UserDetailView.as_view(), name="user_detail"), diff --git a/apps/member/views.py b/apps/member/views.py index 932899ff..9ca7d76a 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -18,15 +18,14 @@ from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm from note.models import Alias, NoteUser -from note.models.notes import NoteActivity from note.models.transactions import Transaction -from note.tables import HistoryTable, AliasTable, NoteActivityTable +from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm, NoteActivityForm + CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -357,82 +356,3 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): def form_valid(self, formset): formset.save() return super().form_valid(formset) - - -class ClubLinkedNotesView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): - model = NoteActivity - table_class = NoteActivityTable - - def get_queryset(self): - return super().get_queryset().filter(club=self.get_object()) - - def get_object(self): - if hasattr(self, 'object'): - return self.object - self.object = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=int(self.kwargs["pk"])) - return self.object - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - club = ctx["object"] = ctx["club"] = self.get_object() - - empty_note = NoteActivity(note_name="", club=club, controller=self.request.user) - ctx["can_create"] = PermissionBackend().has_perm(self.request.user, "note.add_noteactivity", empty_note) - - return ctx - - -class ClubLinkedNoteCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): - model = NoteActivity - form_class = NoteActivityForm - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["club_pk"]) - ctx["object"] = ctx["club"] = club - ctx["form"].fields["club"].initial = club - - return ctx - - def get_success_url(self): - self.object.refresh_from_db() - return reverse_lazy('member:club_linked_note_detail', - kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) - - -class ClubLinkedNoteUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): - model = NoteActivity - form_class = NoteActivityForm - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - ctx["club"] = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["club_pk"]) - - return ctx - - def get_success_url(self): - return reverse_lazy('member:club_linked_note_detail', - kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) - - -class ClubLinkedNoteDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): - model = NoteActivity - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - note = self.get_queryset().filter(pk=self.kwargs["pk"]).get() - - transactions = Transaction.objects.filter(Q(source=note) | Q(destination=note))\ - .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") - ctx['history_list'] = HistoryTable(transactions) - ctx["note"] = note - ctx["club"] = note.club - - return ctx diff --git a/apps/note/admin.py b/apps/note/admin.py index f0dede17..702d3350 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from polymorphic.admin import PolymorphicChildModelAdmin, \ PolymorphicChildModelFilter, PolymorphicParentModelAdmin -from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity +from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \ RecurrentTransaction, MembershipTransaction @@ -24,7 +24,7 @@ class NoteAdmin(PolymorphicParentModelAdmin): """ Parent regrouping all note types as children """ - child_models = (NoteClub, NoteSpecial, NoteUser, NoteActivity) + child_models = (NoteClub, NoteSpecial, NoteUser) list_filter = ( PolymorphicChildModelFilter, 'is_active', @@ -74,14 +74,6 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin): readonly_fields = ('balance',) -@admin.register(NoteActivity) -class NoteActivityAdmin(PolymorphicChildModelAdmin): - """ - Child for a special note, see NoteAdmin - """ - readonly_fields = ('balance',) - - @admin.register(NoteUser) class NoteUserAdmin(PolymorphicChildModelAdmin): """ diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index a445fef9..5625e5b5 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from rest_polymorphic.serializers import PolymorphicSerializer -from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, NoteActivity +from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \ RecurrentTransaction, SpecialTransaction @@ -69,22 +69,6 @@ class NoteUserSerializer(serializers.ModelSerializer): return str(obj) -class NoteActivitySerializer(serializers.ModelSerializer): - """ - REST API Serializer for User's notes. - The djangorestframework plugin will analyse the model `NoteActivity` and parse all fields in the API. - """ - name = serializers.SerializerMethodField() - - class Meta: - model = NoteActivity - fields = '__all__' - read_only_fields = ('note', 'user', ) - - def get_name(self, obj): - return str(obj) - - class AliasSerializer(serializers.ModelSerializer): """ REST API Serializer for Aliases. @@ -107,7 +91,6 @@ class NotePolymorphicSerializer(PolymorphicSerializer): NoteUser: NoteUserSerializer, NoteClub: NoteClubSerializer, NoteSpecial: NoteSpecialSerializer, - NoteActivity: NoteActivitySerializer, } class Meta: diff --git a/apps/note/models/__init__.py b/apps/note/models/__init__.py index dd024963..e9c8a0a9 100644 --- a/apps/note/models/__init__.py +++ b/apps/note/models/__init__.py @@ -1,13 +1,13 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity +from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser from .transactions import MembershipTransaction, Transaction, \ TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction __all__ = [ # Notes - 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', 'NoteActivity', + 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', # Transactions 'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate', 'RecurrentTransaction', 'SpecialTransaction', diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 1228ca00..9282bde9 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -4,13 +4,11 @@ import unicodedata from django.conf import settings -from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.db import models from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel -from member.models import Club """ Defines each note types @@ -176,40 +174,6 @@ class NoteSpecial(Note): return self.special_type -class NoteActivity(Note): - """ - A :model:`note.Note` for accounts that are not attached to a user neither to a club, - that only need to store and transfer money (notes for activities, departments, ...) - """ - - note_name = models.CharField( - verbose_name=_('name'), - max_length=255, - unique=True, - ) - - club = models.ForeignKey( - Club, - on_delete=models.PROTECT, - related_name="linked_notes", - verbose_name=_("club"), - ) - - controller = models.ForeignKey( - User, - on_delete=models.PROTECT, - related_name="+", - verbose_name=_("controller"), - ) - - class Meta: - verbose_name = _("activity note") - verbose_name_plural = _("activity notes") - - def __str__(self): - return self.note_name - - class Alias(models.Model): """ points toward a :model:`note.NoteUser` or :model;`note.NoteClub` instance. diff --git a/apps/note/tables.py b/apps/note/tables.py index 2aba4684..0d83e3cc 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django.utils.html import format_html from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ -from .models.notes import Alias, NoteActivity +from .models.notes import Alias from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money @@ -121,24 +121,6 @@ class AliasTable(tables.Table): attrs={'td': {'class': 'col-sm-1'}}) -class NoteActivityTable(tables.Table): - note_name = tables.LinkColumn( - "member:club_linked_note_detail", - args=[A("club.pk"), A("pk")], - ) - - def render_balance(self, value): - return pretty_money(value) - - class Meta: - attrs = { - 'class': 'table table-condensed table-striped table-hover' - } - model = NoteActivity - fields = ('note_name', 'balance',) - template_name = 'django_tables2/bootstrap4.html' - - class ButtonTable(tables.Table): class Meta: attrs = { diff --git a/apps/permission/backends.py b/apps/permission/backends.py index f838fc1f..30a273cc 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -5,7 +5,7 @@ from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.db.models import Q, F -from note.models import Note, NoteUser, NoteClub, NoteSpecial, NoteActivity +from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club @@ -49,7 +49,6 @@ class PermissionBackend(ModelBackend): NoteUser=NoteUser, NoteClub=NoteClub, NoteSpecial=NoteSpecial, - NoteActivity=NoteActivity, F=F, Q=Q ) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index e0430530..04920cfb 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -176,7 +176,7 @@ "note", "alias" ], - "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}, {\"note__in\": [\"NoteActivity\", \"objects\", [\"all\"]]}]", + "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]", "type": "view", "mask": 1, "field": "", @@ -798,96 +798,6 @@ "description": "Update club" } }, - { - "model": "permission.permission", - "pk": 48, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"club\": [\"club\"]}", - "type": "change", - "mask": 1, - "field": "", - "description": "Manage notes that are linked to a club" - } - }, - { - "model": "permission.permission", - "pk": 49, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"club\": [\"club\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View notes that are linked to a club" - } - }, - { - "model": "permission.permission", - "pk": 50, - "fields": { - "model": [ - "note", - "transaction" - ], - "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", - "type": "add", - "mask": 2, - "field": "", - "description": "Add transactions linked to a noteactivity" - } - }, - { - "model": "permission.permission", - "pk": 51, - "fields": { - "model": [ - "note", - "transaction" - ], - "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}]]", - "type": "view", - "mask": 1, - "field": "", - "description": "View transactions linked to a noteactivity" - } - }, - { - "model": "permission.permission", - "pk": 52, - "fields": { - "model": [ - "note", - "note" - ], - "query": "{\"noteactivity__controller\": [\"user\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View note activity" - } - }, - { - "model": "permission.permission", - "pk": 53, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"controller\": [\"user\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View note activity" - } - }, { "model": "permission.rolepermissions", "pk": 1, @@ -915,6 +825,7 @@ 3, 4, 5, + 6, 7, 8, 9, @@ -932,11 +843,6 @@ 36, 39, 40, - 6, - 52, - 53, - 51, - 50 ] } }, @@ -947,9 +853,9 @@ "role": 8, "permissions": [ 19, + 20, 21, - 22, - 20 + 22 ] } }, @@ -997,9 +903,7 @@ "role": 7, "permissions": [ 22, - 47, - 48, - 49 + 47 ] } } diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c83bf321..695bdf95 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -456,18 +456,6 @@ msgstr "" msgid "special notes" msgstr "" -#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 -msgid "controller" -msgstr "" - -#: apps/note/models/notes.py:206 -msgid "activity note" -msgstr "" - -#: apps/note/models/notes.py:207 -msgid "activity notes" -msgstr "" - #: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "" @@ -626,7 +614,7 @@ msgstr "" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" @@ -903,7 +891,6 @@ msgid "Add member" msgstr "" #: templates/member/club_info.html:45 templates/note/conso_form.html:121 -#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "" @@ -932,7 +919,6 @@ msgid "Member of the Club" msgstr "" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 -#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "" @@ -965,7 +951,6 @@ msgid "Change password" msgstr "" #: templates/member/profile_info.html:33 -#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "" @@ -1014,22 +999,6 @@ msgstr "" msgid "Recent transactions history" msgstr "" -#: templates/note/noteactivity_detail.html:15 -msgid "Linked note:" -msgstr "" - -#: templates/note/noteactivity_detail.html:19 -msgid "attached club" -msgstr "" - -#: templates/note/noteactivity_list.html:15 -msgid "linked notes of club" -msgstr "" - -#: templates/note/noteactivity_list.html:24 -msgid "Add new note" -msgstr "" - #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index cd01499d..d2a78d06 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -457,18 +457,6 @@ msgstr "note spéciale" msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 -msgid "controller" -msgstr "contrôleur" - -#: apps/note/models/notes.py:206 -msgid "activity note" -msgstr "note d'activité" - -#: apps/note/models/notes.py:207 -msgid "activity notes" -msgstr "notes d'activité" - #: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "Alias invalide" @@ -627,7 +615,7 @@ msgstr "Trésorerie" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" @@ -906,7 +894,6 @@ msgid "Add member" msgstr "Ajouter un membre" #: templates/member/club_info.html:45 templates/note/conso_form.html:121 -#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "Éditer" @@ -935,7 +922,6 @@ msgid "Member of the Club" msgstr "Membre du club" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 -#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "Historique des transactions" @@ -968,7 +954,6 @@ msgid "Change password" msgstr "Changer le mot de passe" #: templates/member/profile_info.html:33 -#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "solde du compte" @@ -1017,22 +1002,6 @@ msgstr "Consommations doubles" msgid "Recent transactions history" msgstr "Historique des transactions récentes" -#: templates/note/noteactivity_detail.html:15 -msgid "Linked note:" -msgstr "note attachée :" - -#: templates/note/noteactivity_detail.html:19 -msgid "attached club" -msgstr "club lié" - -#: templates/note/noteactivity_list.html:15 -msgid "linked notes of club" -msgstr "Notes liées au club" - -#: templates/note/noteactivity_list.html:24 -msgid "Add new note" -msgstr "Ajouter une note" - #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "Don" diff --git a/templates/note/noteactivity_detail.html b/templates/note/noteactivity_detail.html deleted file mode 100644 index aab9e055..00000000 --- a/templates/note/noteactivity_detail.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load render_table from django_tables2 %} -{% load pretty_money %} -{% load perms %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
-
-

{% trans "Linked note:" %} {{ note.note_name }}

-
-
-
-
{% trans 'attached club'|capfirst %}
-
{{ club }}
- -
{% trans 'controller'|capfirst %}
-
{{ note.controller }}
- -
{% trans 'balance'|capfirst %}
-
{{ note.balance|pretty_money }}
-
- - {% if "change_"|has_perm:note %} -
- {% trans "Edit" %} -
- {% endif %} -
- - -
- -
-
- {% render_table history_list %} -
-
-
-{% endblock %} - -{% block extrajavascript %} - -{% endblock %} diff --git a/templates/note/noteactivity_form.html b/templates/note/noteactivity_form.html deleted file mode 100644 index 5088c790..00000000 --- a/templates/note/noteactivity_form.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
- {% csrf_token %} - {{ form|crispy }} - -
-{% endblock %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html deleted file mode 100644 index 3cd5b786..00000000 --- a/templates/note/noteactivity_list.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load render_table from django_tables2 %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
-
-
-
-
{% trans "linked notes of club"|capfirst %} {{ club.name }}
-
-
- {% render_table table %} -
-
- - {% if can_create %} - - - - {% endif %} -
-
-{% endblock %} From e98693b21403d32f0e2d91a379f964ab8ef4f6f7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 16:22:11 +0200 Subject: [PATCH 05/19] Memberships are optional for clubs --- apps/member/fixtures/initial.json | 2 ++ apps/member/models.py | 21 +++++++++++++++++++++ apps/permission/fixtures/initial.json | 2 +- templates/member/club_form.html | 20 ++++++++++++++++++++ templates/member/club_info.html | 21 ++++++++++----------- 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index bba1e7ac..649cbbc1 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -5,6 +5,7 @@ "fields": { "name": "BDE", "email": "tresorerie.bde@example.com", + "require_memberships": true, "membership_fee": 500, "membership_duration": "396 00:00:00", "membership_start": "213 00:00:00", @@ -17,6 +18,7 @@ "fields": { "name": "Kfet", "email": "tresorerie.bde@example.com", + "require_memberships": true, "membership_fee": 3500, "membership_duration": "396 00:00:00", "membership_start": "213 00:00:00", diff --git a/apps/member/models.py b/apps/member/models.py index d0051e59..377cc010 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -77,22 +77,34 @@ class Club(models.Model): ) # Memberships + + # When set to False, the membership system won't be used. + # Useful to create notes for activities or departments. + require_memberships = models.BooleanField( + default=True, + verbose_name=_("require memberships"), + ) + membership_fee = models.PositiveIntegerField( + default=0, verbose_name=_('membership fee'), ) membership_duration = models.DurationField( + blank=True, null=True, verbose_name=_('membership duration'), help_text=_('The longest time a membership can last ' '(NULL = infinite).'), ) membership_start = models.DurationField( + blank=True, null=True, verbose_name=_('membership start'), help_text=_('How long after January 1st the members can renew ' 'their membership.'), ) membership_end = models.DurationField( + blank=True, null=True, verbose_name=_('membership end'), help_text=_('How long the membership can last after January 1st ' @@ -100,6 +112,15 @@ class Club(models.Model): 'membership.'), ) + def save(self, force_insert=False, force_update=False, using=None, + update_fields=None): + if not self.require_memberships: + self.membership_fee = 0 + self.membership_duration = None + self.membership_start = None + self.membership_end = None + super().save(force_insert, force_update, update_fields) + class Meta: verbose_name = _("club") verbose_name_plural = _("clubs") diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 04920cfb..5bf0d77d 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -842,7 +842,7 @@ 35, 36, 39, - 40, + 40 ] } }, diff --git a/templates/member/club_form.html b/templates/member/club_form.html index 99c254e3..7abe9db9 100644 --- a/templates/member/club_form.html +++ b/templates/member/club_form.html @@ -9,3 +9,23 @@ {% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 907914be..039583c5 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -18,26 +18,25 @@
{{ club.parent_club.name}}
{% endif %} -
{% trans 'membership start'|capfirst %}
-
{{ club.membership_start }}
+ {% if club.require_memberships %} +
{% trans 'membership start'|capfirst %}
+
{{ club.membership_start }}
-
{% trans 'membership end'|capfirst %}
-
{{ club.membership_end }}
+
{% trans 'membership end'|capfirst %}
+
{{ club.membership_end }}
-
{% trans 'membership duration'|capfirst %}
-
{{ club.membership_duration }}
+
{% trans 'membership duration'|capfirst %}
+
{{ club.membership_duration }}
-
{% trans 'membership fee'|capfirst %}
-
{{ club.membership_fee|pretty_money }}
+
{% trans 'membership fee'|capfirst %}
+
{{ club.membership_fee|pretty_money }}
+ {% endif %}
{% trans 'aliases'|capfirst %}
{{ object.note.alias_set.all|join:", " }}
{% trans 'email'|capfirst %}
{{ club.email }}
- -
{% trans 'linked notes'|capfirst %}
-
{{ club.linked_notes.all|join:", " }}
From bf9789bd9e650baaf2811b4350d7d2ff6b468fc4 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 23:54:14 +0200 Subject: [PATCH 06/19] Restructurate memberships, closes #16 --- apps/member/fixtures/initial.json | 12 +-- apps/member/forms.py | 32 +------ apps/member/models.py | 47 +++++++-- apps/member/views.py | 41 ++++---- apps/permission/backends.py | 1 + locale/de/LC_MESSAGES/django.po | 154 ++++++++++++++++-------------- locale/fr/LC_MESSAGES/django.po | 147 +++++++++++++++------------- note_kfet/inputs.py | 3 +- templates/member/add_members.html | 16 +--- templates/member/club_info.html | 2 +- 10 files changed, 231 insertions(+), 224 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index 649cbbc1..094d2c3f 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -7,9 +7,9 @@ "email": "tresorerie.bde@example.com", "require_memberships": true, "membership_fee": 500, - "membership_duration": "396 00:00:00", - "membership_start": "213 00:00:00", - "membership_end": "273 00:00:00" + "membership_duration": 396, + "membership_start": "2019-08-31", + "membership_end": "2020-09-30" } }, { @@ -20,9 +20,9 @@ "email": "tresorerie.bde@example.com", "require_memberships": true, "membership_fee": 3500, - "membership_duration": "396 00:00:00", - "membership_start": "213 00:00:00", - "membership_end": "273 00:00:00" + "membership_duration": 396, + "membership_start": "2019-08-31", + "membership_end": "2020-09-30" } } ] diff --git a/apps/member/forms.py b/apps/member/forms.py index 80c2b49e..9ac4ffa9 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -1,13 +1,10 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from crispy_forms.bootstrap import Div -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from note_kfet.inputs import Autocomplete, AmountInput +from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -55,6 +52,8 @@ class ClubForm(forms.ModelForm): 'api_url': '/api/members/club/', } ), + "membership_start": DatePickerInput(), + "membership_end": DatePickerInput(), } @@ -80,28 +79,5 @@ class MembershipForm(forms.ModelForm): 'placeholder': 'Nom ...', }, ), + 'date_start': DatePickerInput(), } - - -MemberFormSet = forms.modelformset_factory( - Membership, - form=MembershipForm, - extra=2, - can_delete=True, -) - - -class FormSetHelper(FormHelper): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.form_tag = False - self.form_method = 'POST' - self.form_class = 'form-inline' - # self.template = 'bootstrap/table_inline_formset.html' - self.layout = Layout( - Div( - Div('user', css_class='col-sm-2'), - Div('roles', css_class='col-sm-2'), - Div('date_start', css_class='col-sm-2'), - css_class="row formset-row", - )) diff --git a/apps/member/models.py b/apps/member/models.py index 377cc010..8906af9c 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -83,27 +83,31 @@ class Club(models.Model): require_memberships = models.BooleanField( default=True, verbose_name=_("require memberships"), + help_text=_("Uncheck if this club don't require memberships."), ) membership_fee = models.PositiveIntegerField( default=0, verbose_name=_('membership fee'), ) - membership_duration = models.DurationField( + + membership_duration = models.IntegerField( blank=True, null=True, verbose_name=_('membership duration'), - help_text=_('The longest time a membership can last ' + help_text=_('The longest time (in days) a membership can last ' '(NULL = infinite).'), ) - membership_start = models.DurationField( + + membership_start = models.DateField( blank=True, null=True, verbose_name=_('membership start'), help_text=_('How long after January 1st the members can renew ' 'their membership.'), ) - membership_end = models.DurationField( + + membership_end = models.DateField( blank=True, null=True, verbose_name=_('membership end'), @@ -112,6 +116,20 @@ class Club(models.Model): 'membership.'), ) + def update_membership_dates(self): + """ + This function is called each time the club detail view is displayed. + Update the year of the membership dates. + """ + today = datetime.date.today() + + if (today - self.membership_start).days >= 365: + self.membership_start = datetime.date(self.membership_start.year + 1, + self.membership_start.month, self.membership_start.day) + self.membership_end = datetime.date(self.membership_end.year + 1, + self.membership_end.month, self.membership_end.day) + self.save(force_update=True) + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.require_memberships: @@ -135,9 +153,6 @@ class Club(models.Model): class Role(models.Model): """ Role that an :model:`auth.User` can have in a :model:`member.Club` - - TODO: Integrate the right management, and create some standard Roles at the - creation of the club. """ name = models.CharField( verbose_name=_('name'), @@ -162,21 +177,25 @@ class Membership(models.Model): settings.AUTH_USER_MODEL, on_delete=models.PROTECT, ) + club = models.ForeignKey( Club, on_delete=models.PROTECT, ) - roles = models.ForeignKey( + + roles = models.ManyToManyField( Role, - on_delete=models.PROTECT, ) + date_start = models.DateField( verbose_name=_('membership starts on'), ) + date_end = models.DateField( verbose_name=_('membership ends on'), null=True, ) + fee = models.PositiveIntegerField( verbose_name=_('fee'), ) @@ -189,8 +208,16 @@ class Membership(models.Model): def save(self, *args, **kwargs): if self.club.parent_club is not None: - if not Membership.objects.filter(user=self.user, club=self.club.parent_club): + if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): raise ValidationError(_('User is not a member of the parent club')) + + created = not self.pk + if created: + self.fee = self.club.membership_fee + self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) + if self.date_end > self.club.membership_end: + self.date_end = self.club.membership_end + super().save(*args, **kwargs) class Meta: diff --git a/apps/member/views.py b/apps/member/views.py index 9ca7d76a..651dfc35 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later import io +from datetime import datetime from PIL import Image from django.conf import settings @@ -24,8 +25,7 @@ from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper -from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm +from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -281,13 +281,19 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + club = context["club"] + if PermissionBackend().has_perm(self.request.user, "member.change_club_membership_start", club): + club.update_membership_dates() + club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) - club_member = Membership.objects.filter(club=club)\ - .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() - # TODO: consider only valid Membership + club_member = Membership.objects.filter( + club=club, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() context['member_list'] = club_member return context @@ -328,31 +334,20 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form_class = MembershipForm template_name = 'member/add_members.html' - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view") - | PermissionBackend.filter_queryset(self.request.user, Membership, - "change")) - def get_context_data(self, **kwargs): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) - context['formset'] = MemberFormSet() - context['helper'] = FormSetHelper() context['club'] = club context['no_cache'] = True return context - def post(self, request, *args, **kwargs): - return - # TODO: Implement POST - # formset = MembershipFormset(request.POST) - # if formset.is_valid(): - # return self.form_valid(formset) - # else: - # return self.form_invalid(formset) + def form_valid(self, form): + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["pk"]) + form.instance.club = club + return super().form_valid(form) - def form_valid(self, formset): - formset.save() - return super().form_valid(formset) + def get_success_url(self): + return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 30a273cc..f478cd5d 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -32,6 +32,7 @@ class PermissionBackend(ModelBackend): for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ .filter( rolepermissions__role__membership__user=user, + rolepermissions__role__membership__valid=True, model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 695bdf95..a4bfb939 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-31 04:16+0200\n" +"POT-Creation-Date: 2020-03-31 23:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,11 +44,10 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 -#: apps/note/models/transactions.py:24 apps/note/models/transactions.py:44 -#: apps/note/models/transactions.py:231 templates/member/club_info.html:13 -#: templates/member/profile_info.html:14 +#: apps/member/models.py:64 apps/member/models.py:158 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "" @@ -73,14 +72,14 @@ msgstr "" msgid "description" msgstr "" -#: apps/activity/models.py:60 apps/note/models/notes.py:166 +#: apps/activity/models.py:60 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:119 +#: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -89,7 +88,7 @@ msgid "organizer" msgstr "" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:58 msgid "note" msgstr "" @@ -179,7 +178,7 @@ msgstr "" msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 msgid "Note" msgstr "" @@ -227,12 +226,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:160 +#: apps/logs/models.py:61 apps/note/tables.py:142 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "" @@ -276,7 +275,7 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:69 templates/member/club_info.html:36 +#: apps/member/models.py:69 templates/member/club_info.html:38 msgid "email" msgstr "" @@ -284,90 +283,97 @@ msgstr "" msgid "parent club" msgstr "" -#: apps/member/models.py:81 templates/member/club_info.html:30 -msgid "membership fee" -msgstr "" - -#: apps/member/models.py:85 templates/member/club_info.html:27 -msgid "membership duration" +#: apps/member/models.py:85 +msgid "require memberships" msgstr "" #: apps/member/models.py:86 -msgid "The longest time a membership can last (NULL = infinite)." +msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:91 templates/member/club_info.html:21 -msgid "membership start" +#: apps/member/models.py:91 templates/member/club_info.html:31 +msgid "membership fee" msgstr "" -#: apps/member/models.py:92 -msgid "How long after January 1st the members can renew their membership." -msgstr "" - -#: apps/member/models.py:97 templates/member/club_info.html:24 -msgid "membership end" +#: apps/member/models.py:97 templates/member/club_info.html:28 +msgid "membership duration" msgstr "" #: apps/member/models.py:98 +msgid "The longest time (in days) a membership can last (NULL = infinite)." +msgstr "" + +#: apps/member/models.py:105 templates/member/club_info.html:22 +msgid "membership start" +msgstr "" + +#: apps/member/models.py:106 +msgid "How long after January 1st the members can renew their membership." +msgstr "" + +#: apps/member/models.py:113 templates/member/club_info.html:25 +msgid "membership end" +msgstr "" + +#: apps/member/models.py:114 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:104 apps/note/models/notes.py:141 -#: apps/note/models/notes.py:195 +#: apps/member/models.py:143 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:105 +#: apps/member/models.py:144 msgid "clubs" msgstr "" -#: apps/member/models.py:128 apps/permission/models.py:284 +#: apps/member/models.py:164 apps/permission/models.py:284 msgid "role" msgstr "" -#: apps/member/models.py:129 +#: apps/member/models.py:165 msgid "roles" msgstr "" -#: apps/member/models.py:153 +#: apps/member/models.py:191 msgid "membership starts on" msgstr "" -#: apps/member/models.py:156 +#: apps/member/models.py:195 msgid "membership ends on" msgstr "" -#: apps/member/models.py:160 +#: apps/member/models.py:200 msgid "fee" msgstr "" -#: apps/member/models.py:172 +#: apps/member/models.py:212 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:176 +#: apps/member/models.py:224 msgid "membership" msgstr "" -#: apps/member/models.py:177 +#: apps/member/models.py:225 msgid "memberships" msgstr "" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/views.py:77 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:91 +#: apps/member/views.py:90 msgid "An alias with a similar name already exists." msgstr "" -#: apps/note/admin.py:128 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" -#: apps/note/admin.py:136 apps/note/admin.py:164 +#: apps/note/admin.py:128 apps/note/admin.py:156 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -380,104 +386,104 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:30 +#: apps/note/models/notes.py:28 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:34 +#: apps/note/models/notes.py:32 msgid "last negative date" msgstr "" -#: apps/note/models/notes.py:35 +#: apps/note/models/notes.py:33 msgid "last time the balance was negative" msgstr "" -#: apps/note/models/notes.py:40 +#: apps/note/models/notes.py:38 msgid "active" msgstr "" -#: apps/note/models/notes.py:43 +#: apps/note/models/notes.py:41 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:47 +#: apps/note/models/notes.py:45 msgid "display image" msgstr "" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "" -#: apps/note/models/notes.py:61 +#: apps/note/models/notes.py:59 msgid "notes" msgstr "" -#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 +#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:123 +#: apps/note/models/notes.py:121 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:124 +#: apps/note/models/notes.py:122 msgid "users note" msgstr "" -#: apps/note/models/notes.py:130 +#: apps/note/models/notes.py:128 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:145 +#: apps/note/models/notes.py:143 msgid "club note" msgstr "" -#: apps/note/models/notes.py:146 +#: apps/note/models/notes.py:144 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:152 +#: apps/note/models/notes.py:150 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:172 +#: apps/note/models/notes.py:170 msgid "special note" msgstr "" -#: apps/note/models/notes.py:173 +#: apps/note/models/notes.py:171 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:230 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:246 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "" -#: apps/note/models/notes.py:247 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:35 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:274 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:287 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "" @@ -614,7 +620,7 @@ msgstr "" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 +#: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" @@ -882,23 +888,23 @@ msgstr "" msgid "Club Parent" msgstr "" -#: templates/member/club_info.html:39 -msgid "linked notes" +#: templates/member/club_info.html:29 +msgid "days" msgstr "" -#: templates/member/club_info.html:44 +#: templates/member/club_info.html:43 msgid "Add member" msgstr "" -#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/member/club_info.html:44 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:46 +#: templates/member/club_info.html:45 msgid "Add roles" msgstr "" -#: templates/member/club_info.html:49 templates/member/profile_info.html:48 +#: templates/member/club_info.html:48 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d2a78d06..f4568da4 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-31 04:16+0200\n" +"POT-Creation-Date: 2020-03-31 23:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,11 +40,10 @@ msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 -#: apps/note/models/transactions.py:24 apps/note/models/transactions.py:44 -#: apps/note/models/transactions.py:231 templates/member/club_info.html:13 -#: templates/member/profile_info.html:14 +#: apps/member/models.py:64 apps/member/models.py:158 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "nom" @@ -69,14 +68,14 @@ msgstr "types d'activité" msgid "description" msgstr "description" -#: apps/activity/models.py:60 apps/note/models/notes.py:166 +#: apps/activity/models.py:60 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:119 +#: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -85,7 +84,7 @@ msgid "organizer" msgstr "organisateur" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:58 msgid "note" msgstr "note" @@ -175,7 +174,7 @@ msgstr "Nom de famille" msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 msgid "Note" msgstr "Note" @@ -223,12 +222,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:160 +#: apps/logs/models.py:61 apps/note/tables.py:142 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "Supprimer" @@ -272,7 +271,7 @@ msgstr "payé" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:69 templates/member/club_info.html:36 +#: apps/member/models.py:69 templates/member/club_info.html:38 msgid "email" msgstr "courriel" @@ -280,33 +279,41 @@ msgstr "courriel" msgid "parent club" msgstr "club parent" -#: apps/member/models.py:81 templates/member/club_info.html:30 +#: apps/member/models.py:85 +msgid "require memberships" +msgstr "nécessite des adhésions" + +#: apps/member/models.py:86 +msgid "Uncheck if this club don't require memberships." +msgstr "Décochez si ce club n'utilise pas d'adhésions." + +#: apps/member/models.py:91 templates/member/club_info.html:31 msgid "membership fee" msgstr "cotisation pour adhérer" -#: apps/member/models.py:85 templates/member/club_info.html:27 +#: apps/member/models.py:97 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:86 -msgid "The longest time a membership can last (NULL = infinite)." -msgstr "La durée maximale d'une adhésion (NULL = infinie)." +#: apps/member/models.py:98 +msgid "The longest time (in days) a membership can last (NULL = infinite)." +msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:91 templates/member/club_info.html:21 +#: apps/member/models.py:105 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:92 +#: apps/member/models.py:106 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:97 templates/member/club_info.html:24 +#: apps/member/models.py:113 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:98 +#: apps/member/models.py:114 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -314,60 +321,59 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:104 apps/note/models/notes.py:141 -#: apps/note/models/notes.py:195 +#: apps/member/models.py:143 apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:105 +#: apps/member/models.py:144 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:128 apps/permission/models.py:284 +#: apps/member/models.py:164 apps/permission/models.py:284 msgid "role" msgstr "rôle" -#: apps/member/models.py:129 +#: apps/member/models.py:165 msgid "roles" msgstr "rôles" -#: apps/member/models.py:153 +#: apps/member/models.py:191 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:156 +#: apps/member/models.py:195 msgid "membership ends on" msgstr "l'adhésion finie le" -#: apps/member/models.py:160 +#: apps/member/models.py:200 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:172 +#: apps/member/models.py:212 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:176 +#: apps/member/models.py:224 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:177 +#: apps/member/models.py:225 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/views.py:77 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:91 +#: apps/member/views.py:90 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/note/admin.py:128 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" -#: apps/note/admin.py:136 apps/note/admin.py:164 +#: apps/note/admin.py:128 apps/note/admin.py:156 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -380,105 +386,105 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:30 +#: apps/note/models/notes.py:28 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:34 +#: apps/note/models/notes.py:32 msgid "last negative date" msgstr "dernier date de négatif" -#: apps/note/models/notes.py:35 +#: apps/note/models/notes.py:33 msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:40 +#: apps/note/models/notes.py:38 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:43 +#: apps/note/models/notes.py:41 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:47 +#: apps/note/models/notes.py:45 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:61 +#: apps/note/models/notes.py:59 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 +#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:123 +#: apps/note/models/notes.py:121 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:124 +#: apps/note/models/notes.py:122 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:130 +#: apps/note/models/notes.py:128 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:145 +#: apps/note/models/notes.py:143 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:146 +#: apps/note/models/notes.py:144 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:152 +#: apps/note/models/notes.py:150 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:172 +#: apps/note/models/notes.py:170 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:173 +#: apps/note/models/notes.py:171 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:230 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:246 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:247 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:35 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:274 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:287 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -615,7 +621,7 @@ msgstr "Trésorerie" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:9 +#: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" @@ -885,23 +891,23 @@ msgstr "Ajouter un alias" msgid "Club Parent" msgstr "Club parent" -#: templates/member/club_info.html:39 -msgid "linked notes" -msgstr "notes liées" +#: templates/member/club_info.html:29 +msgid "days" +msgstr "jours" -#: templates/member/club_info.html:44 +#: templates/member/club_info.html:43 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/member/club_info.html:44 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:46 +#: templates/member/club_info.html:45 msgid "Add roles" msgstr "Ajouter des rôles" -#: templates/member/club_info.html:49 templates/member/profile_info.html:48 +#: templates/member/club_info.html:48 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -1210,3 +1216,6 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." #: templates/treasury/remittance_list.html:54 msgid "Closed remittances" msgstr "Remises fermées" + +#~ msgid "linked notes" +#~ msgstr "notes liées" diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index a3170007..81f55dee 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -1,6 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +import datetime from json import dumps as json_dumps from django.forms.widgets import DateTimeBaseInput, NumberInput, TextInput @@ -299,4 +300,4 @@ class YearPickerInput(BasePickerInput): def _link_to(self, linked_picker): """Customize the options when linked with other date-time input""" yformat = self.config['options']['format'].replace('-01-01', '-12-31') - self.config['options']['format'] = yformat \ No newline at end of file + self.config['options']['format'] = yformat diff --git a/templates/member/add_members.html b/templates/member/add_members.html index 8b57e7d4..c44440bf 100644 --- a/templates/member/add_members.html +++ b/templates/member/add_members.html @@ -1,29 +1,21 @@ {% extends "member/noteowner_detail.html" %} {% load crispy_forms_tags %} {% load static %} +{% load i18n %} {% block profile_info %} {% include "member/club_info.html" %} {% endblock %} -{% block profile_content %} +{% block profile_content %}
{% csrf_token %} - {% crispy formset helper %} -
- -
+ {{ form|crispy }} +
{% endblock %} {% block extrajavascript %} - {% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 039583c5..da747ccd 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -26,7 +26,7 @@
{{ club.membership_end }}
{% trans 'membership duration'|capfirst %}
-
{{ club.membership_duration }}
+
{{ club.membership_duration }} {% trans "days" %}
{% trans 'membership fee'|capfirst %}
{{ club.membership_fee|pretty_money }}
From d5b010980b6e1da604ae0b345c1fbb4c827e420c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 03:42:19 +0200 Subject: [PATCH 07/19] Full membership support --- apps/logs/signals.py | 6 +++ apps/member/fixtures/initial.json | 1 + apps/member/forms.py | 6 +-- apps/member/models.py | 40 +++++++++++++--- apps/member/tables.py | 38 ++++++++++++++- apps/member/urls.py | 9 ++-- apps/member/views.py | 77 +++++++++++++++++++++++++++++-- apps/note/admin.py | 7 +++ apps/note/models/transactions.py | 1 + apps/permission/backends.py | 5 +- apps/permission/models.py | 4 +- apps/permission/signals.py | 26 +++-------- note_kfet/inputs.py | 1 - templates/member/club_info.html | 11 +++-- 14 files changed, 186 insertions(+), 46 deletions(-) diff --git a/apps/logs/signals.py b/apps/logs/signals.py index 43fc1e13..37e9ba79 100644 --- a/apps/logs/signals.py +++ b/apps/logs/signals.py @@ -50,6 +50,9 @@ def save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_save"): + return + # noinspection PyProtectedMember previous = instance._previous @@ -106,6 +109,9 @@ def delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_delete"): + return + # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP user, ip = get_current_authenticated_user(), get_current_ip() diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index 094d2c3f..d72377f8 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -18,6 +18,7 @@ "fields": { "name": "Kfet", "email": "tresorerie.bde@example.com", + "parent_club": 1, "require_memberships": true, "membership_fee": 3500, "membership_duration": 396, diff --git a/apps/member/forms.py b/apps/member/forms.py index 9ac4ffa9..87d5322e 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask @@ -57,11 +58,6 @@ class ClubForm(forms.ModelForm): } -class AddMembersForm(forms.Form): - class Meta: - fields = ('',) - - class MembershipForm(forms.ModelForm): class Meta: model = Membership diff --git a/apps/member/models.py b/apps/member/models.py index 8906af9c..180839d8 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -4,11 +4,14 @@ import datetime from django.conf import settings -from django.core.exceptions import ValidationError +from django.contrib.auth.models import User +from django.core.exceptions import ValidationError, PermissionDenied from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ +from note.models import MembershipTransaction + class Profile(models.Model): """ @@ -91,7 +94,7 @@ class Club(models.Model): verbose_name=_('membership fee'), ) - membership_duration = models.IntegerField( + membership_duration = models.PositiveIntegerField( blank=True, null=True, verbose_name=_('membership duration'), @@ -174,7 +177,7 @@ class Membership(models.Model): """ user = models.ForeignKey( - settings.AUTH_USER_MODEL, + User, on_delete=models.PROTECT, ) @@ -185,6 +188,7 @@ class Membership(models.Model): roles = models.ManyToManyField( Role, + verbose_name=_("roles"), ) date_start = models.DateField( @@ -209,17 +213,41 @@ class Membership(models.Model): def save(self, *args, **kwargs): if self.club.parent_club is not None: if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): - raise ValidationError(_('User is not a member of the parent club')) + raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name) created = not self.pk if created: + if Membership.objects.filter( + user=self.user, + club=self.club, + date_start__lte=datetime.datetime.now().date(), + date_end__gte=datetime.datetime.now().date(), + ).exists(): + raise ValidationError(_('User is already a member of the club')) + self.fee = self.club.membership_fee - self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) - if self.date_end > self.club.membership_end: + if self.club.membership_duration is not None: + self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) + else: + self.date_end = self.date_start + datetime.timedelta(days=0x7FFFFFFF) + if self.club.membership_end is not None and self.date_end > self.club.membership_end: self.date_end = self.club.membership_end super().save(*args, **kwargs) + if created and self.fee: + try: + MembershipTransaction.objects.create( + membership=self, + source=self.user.note, + destination=self.club.note, + quantity=1, + amount=self.fee, + reason="Adhésion", + ) + except PermissionDenied: + self.delete() + class Meta: verbose_name = _('membership') verbose_name_plural = _('memberships') diff --git a/apps/member/tables.py b/apps/member/tables.py index d0c37a6e..18a2a555 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -3,8 +3,14 @@ import django_tables2 as tables from django.contrib.auth.models import User +from django.urls import reverse_lazy +from django.utils.html import format_html +from django_tables2 import A -from .models import Club +from note.templatetags.pretty_money import pretty_money +from note_kfet.middlewares import get_current_authenticated_user +from permission.backends import PermissionBackend +from .models import Club, Membership class ClubTable(tables.Table): @@ -33,3 +39,33 @@ class UserTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('last_name', 'first_name', 'username', 'email') model = User + + +class MembershipTable(tables.Table): + roles = tables.Column( + attrs={ + "td": { + "class": "text-truncate", + } + } + ) + + def render_fee(self, value): + return pretty_money(value) + + def render_roles(self, record): + roles = record.roles.all() + s = ", ".join(str(role) for role in roles) + if PermissionBackend().has_perm(get_current_authenticated_user(), "member.change_membership_roles", record): + s = format_html("" + s + "") + return s + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover', + 'style': 'table-layout: fixed;' + } + template_name = 'django_tables2/bootstrap4.html' + fields = ('user', 'club', 'date_start', 'date_end', 'roles', 'fee', ) + model = Membership diff --git a/apps/member/urls.py b/apps/member/urls.py index 7f4bf0d5..2000a6e4 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -12,15 +12,16 @@ urlpatterns = [ path('club/', views.ClubListView.as_view(), name="club_list"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), + path('club/manage_roles//', views.ClubManageRolesView.as_view(), name="club_manage_roles"), path('club/create/', views.ClubCreateView.as_view(), name="club_create"), path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), path('user/', views.UserListView.as_view(), name="user_list"), - path('user/', views.UserDetailView.as_view(), name="user_detail"), - path('user//update', views.UserUpdateView.as_view(), name="user_update_profile"), - path('user//update_pic', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"), - path('user//aliases', views.ProfileAliasView.as_view(), name="user_alias"), + path('user//', views.UserDetailView.as_view(), name="user_detail"), + path('user//update/', views.UserUpdateView.as_view(), name="user_update_profile"), + path('user//update_pic/', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"), + path('user//aliases/', views.ProfileAliasView.as_view(), name="user_alias"), path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'), ] diff --git a/apps/member/views.py b/apps/member/views.py index 651dfc35..ad01e2a2 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -10,6 +10,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.auth.views import LoginView from django.db.models import Q +from django.forms import HiddenInput from django.shortcuts import redirect from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -27,7 +28,7 @@ from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership -from .tables import ClubTable, UserTable +from .tables import ClubTable, UserTable, MembershipTable class CustomLoginView(LoginView): @@ -138,7 +139,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context['history_list'] = HistoryTable(history_list) club_list = Membership.objects.all().filter(user=user)\ .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") - context['club_list'] = ClubTable(club_list) + context['club_list'] = MembershipTable(data=club_list) return context @@ -294,7 +295,19 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): date_start__lte=datetime.now().date(), date_end__gte=datetime.now().date(), ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() - context['member_list'] = club_member + + context['member_list'] = MembershipTable(data=club_member) + + empty_membership = Membership( + club=club, + user=User.objects.first(), + date_start=datetime.now().date(), + date_end=datetime.now().date(), + fee=0, + ) + context["can_add_members"] = PermissionBackend()\ + .has_perm(self.request.user, "member.add_membership", empty_membership) + return context @@ -339,7 +352,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) context['club'] = club - context['no_cache'] = True return context @@ -347,6 +359,63 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) form.instance.club = club + + if club.parent_club is not None: + if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): + form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) + return super().form_invalid(form) + + if Membership.objects.filter( + user=form.instance.user, + club=club, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).exists(): + form.add_error('user', _('User is already a member of the club')) + return super().form_invalid(form) + + if form.instance.date_start < form.instance.club.membership_start: + form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + if form.instance.date_start > form.instance.club.membership_end: + form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) + + +class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + model = Membership + form_class = MembershipForm + template_name = 'member/add_members.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + club = self.object.club + context['club'] = club + form = context['form'] + form.fields['user'].disabled = True + form.fields['date_start'].widget = HiddenInput() + + return context + + def form_valid(self, form): + if form.instance.date_start < form.instance.club.membership_start: + form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + if form.instance.date_start > form.instance.club.membership_end: + form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + return super().form_valid(form) def get_success_url(self): diff --git a/apps/note/admin.py b/apps/note/admin.py index 702d3350..7b4ba870 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -138,6 +138,13 @@ class TransactionAdmin(PolymorphicParentModelAdmin): return [] +@admin.register(MembershipTransaction) +class MembershipTransactionAdmin(PolymorphicChildModelAdmin): + """ + Admin customisation for Transaction + """ + + @admin.register(TransactionTemplate) class TransactionTemplateAdmin(admin.ModelAdmin): """ diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index d1dcd788..d9b860ae 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -140,6 +140,7 @@ class Transaction(PolymorphicModel): max_length=255, default=None, null=True, + blank=True, ) class Meta: diff --git a/apps/permission/backends.py b/apps/permission/backends.py index f478cd5d..b95f8203 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -1,6 +1,8 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +import datetime + from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType @@ -32,7 +34,8 @@ class PermissionBackend(ModelBackend): for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ .filter( rolepermissions__role__membership__user=user, - rolepermissions__role__membership__valid=True, + rolepermissions__role__membership__date_start__lte=datetime.date.today(), + rolepermissions__role__membership__date_end__gte=datetime.date.today(), model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): diff --git a/apps/permission/models.py b/apps/permission/models.py index d1b55090..c8df07c0 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -45,11 +45,13 @@ class InstancedPermission: else: oldpk = obj.pk # Ensure previous models are deleted - self.model.model_class().objects.filter(pk=obj.pk).delete() + self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk") + 1).delete() # Force insertion, no data verification, no trigger + obj._force_save = True Model.save(obj, force_insert=True) ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object + obj._force_delete = True Model.delete(obj) # If the primary key was specified, we restore it diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 1e30f56f..5ccb9c0b 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -29,6 +29,9 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_save"): + return + user = get_current_authenticated_user() if user is None: # Action performed on shell is always granted @@ -58,32 +61,14 @@ def pre_save_object(sender, instance, **kwargs): if not PermissionBackend().has_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): raise PermissionDenied else: - # We check if the user can add the model - - # While checking permissions, the object will be inserted in the DB, then removed. - # We disable temporary the connectors - pre_save.disconnect(pre_save_object) - pre_delete.disconnect(pre_delete_object) - # We disable also logs connectors - pre_save.disconnect(logs_signals.pre_save_object) - post_save.disconnect(logs_signals.save_object) - post_delete.disconnect(logs_signals.delete_object) - # We check if the user has right to add the object has_perm = PermissionBackend().has_perm(user, app_label + ".add_" + model_name, instance) - # Then we reconnect all - pre_save.connect(pre_save_object) - pre_delete.connect(pre_delete_object) - pre_save.connect(logs_signals.pre_save_object) - post_save.connect(logs_signals.save_object) - post_delete.connect(logs_signals.delete_object) - if not has_perm: raise PermissionDenied -def pre_delete_object(sender, instance, **kwargs): +def pre_delete_object(instance, **kwargs): """ Before a model get deleted, we check the permissions """ @@ -91,6 +76,9 @@ def pre_delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_delete"): + return + user = get_current_authenticated_user() if user is None: # Action performed on shell is always granted diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index 81f55dee..ecd758e0 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -1,7 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -import datetime from json import dumps as json_dumps from django.forms.widgets import DateTimeBaseInput, NumberInput, TextInput diff --git a/templates/member/club_info.html b/templates/member/club_info.html index da747ccd..23a41c1c 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -1,4 +1,4 @@ -{% load i18n static pretty_money %} +{% load i18n static pretty_money perms %}

Club {{ club.name }}

@@ -40,9 +40,12 @@
- {% trans "Add member" %} - {% trans "Edit" %} - {% trans "Add roles" %} + {% if can_add_members %} + {% trans "Add member" %} + {% endif %} + {% if ".change_"|has_perm:club %} + {% trans "Edit" %} + {% endif %} {% url 'member:club_detail' club.pk as club_detail_url %} {%if request.get_full_path != club_detail_url %} {% trans 'View Profile' %} From 0df0f3f66b7089fbba29580500be74c90181eb90 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:07:55 +0200 Subject: [PATCH 08/19] Membership fees for paid and unpaid students, closes #43 --- apps/member/fixtures/initial.json | 6 +- apps/member/forms.py | 4 +- apps/member/models.py | 47 +++++---- apps/member/tables.py | 3 +- apps/member/views.py | 4 +- apps/permission/fixtures/initial.json | 107 ++++++++++++++++++++- apps/permission/models.py | 2 + apps/permission/signals.py | 6 +- locale/de/LC_MESSAGES/django.po | 126 +++++++++++++----------- locale/fr/LC_MESSAGES/django.po | 133 ++++++++++++++------------ templates/member/club_form.html | 6 +- templates/member/club_info.html | 7 +- 12 files changed, 301 insertions(+), 150 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index d72377f8..e27eb72d 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -6,7 +6,8 @@ "name": "BDE", "email": "tresorerie.bde@example.com", "require_memberships": true, - "membership_fee": 500, + "membership_fee_paid": 500, + "membership_fee_unpaid": 500, "membership_duration": 396, "membership_start": "2019-08-31", "membership_end": "2020-09-30" @@ -20,7 +21,8 @@ "email": "tresorerie.bde@example.com", "parent_club": 1, "require_memberships": true, - "membership_fee": 3500, + "membership_fee_paid": 3500, + "membership_fee_unpaid": 3500, "membership_duration": 396, "membership_start": "2019-08-31", "membership_end": "2020-09-30" diff --git a/apps/member/forms.py b/apps/member/forms.py index 87d5322e..a37d143e 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,7 +4,6 @@ from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask @@ -46,7 +45,8 @@ class ClubForm(forms.ModelForm): model = Club fields = '__all__' widgets = { - "membership_fee": AmountInput(), + "membership_fee_paid": AmountInput(), + "membership_fee_unpaid": AmountInput(), "parent_club": Autocomplete( Club, attrs={ diff --git a/apps/member/models.py b/apps/member/models.py index 180839d8..47807976 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError, PermissionDenied from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ - from note.models import MembershipTransaction @@ -89,9 +88,14 @@ class Club(models.Model): help_text=_("Uncheck if this club don't require memberships."), ) - membership_fee = models.PositiveIntegerField( + membership_fee_paid = models.PositiveIntegerField( default=0, - verbose_name=_('membership fee'), + verbose_name=_('membership fee (paid students)'), + ) + + membership_fee_unpaid = models.PositiveIntegerField( + default=0, + verbose_name=_('membership fee (unpaid students)'), ) membership_duration = models.PositiveIntegerField( @@ -136,7 +140,8 @@ class Club(models.Model): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.require_memberships: - self.membership_fee = 0 + self.membership_fee_paid = 0 + self.membership_fee_unpaid = 0 self.membership_duration = None self.membership_start = None self.membership_end = None @@ -225,7 +230,10 @@ class Membership(models.Model): ).exists(): raise ValidationError(_('User is already a member of the club')) - self.fee = self.club.membership_fee + if self.user.profile.paid: + self.fee = self.club.membership_fee_paid + else: + self.fee = self.club.membership_fee_unpaid if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: @@ -235,18 +243,23 @@ class Membership(models.Model): super().save(*args, **kwargs) - if created and self.fee: - try: - MembershipTransaction.objects.create( - membership=self, - source=self.user.note, - destination=self.club.note, - quantity=1, - amount=self.fee, - reason="Adhésion", - ) - except PermissionDenied: - self.delete() + self.make_transaction() + + def make_transaction(self): + if self.transaction is not None or not self.fee: + return + + if self.fee: + transaction = MembershipTransaction( + membership=self, + source=self.user.note, + destination=self.club.note, + quantity=1, + amount=self.fee, + reason="Adhésion", + ) + transaction._force_save = True + transaction.save(force_insert=True) class Meta: verbose_name = _('membership') diff --git a/apps/member/tables.py b/apps/member/tables.py index 18a2a555..ec21c712 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -5,11 +5,10 @@ import django_tables2 as tables from django.contrib.auth.models import User from django.urls import reverse_lazy from django.utils.html import format_html -from django_tables2 import A - from note.templatetags.pretty_money import pretty_money from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend + from .models import Club, Membership diff --git a/apps/member/views.py b/apps/member/views.py index ad01e2a2..226cafab 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -380,7 +380,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): return super().form_invalid(form) if form.instance.date_start > form.instance.club.membership_end: - form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) @@ -412,7 +412,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return super().form_invalid(form) if form.instance.date_start > form.instance.club.membership_end: - form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 5bf0d77d..4cf3ecfa 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -798,6 +798,51 @@ "description": "Update club" } }, + { + "model": "permission.permission", + "pk": 48, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"user\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View our memberships" + } + }, + { + "model": "permission.permission", + "pk": 49, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"club\": [\"club\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View club's memberships" + } + }, + { + "model": "permission.permission", + "pk": 50, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"club\": [\"club\"]}", + "type": "add", + "mask": 2, + "field": "", + "description": "Add a membership to a club" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -810,7 +855,8 @@ 8, 9, 10, - 11 + 11, + 48 ] } }, @@ -906,5 +952,64 @@ 47 ] } + }, + { + "model": "permission.rolepermissions", + "pk": 7, + "fields": { + "role": 5, + "permissions": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50 + ] + } } ] diff --git a/apps/permission/models.py b/apps/permission/models.py index c8df07c0..b1012159 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -49,6 +49,8 @@ class InstancedPermission: # Force insertion, no data verification, no trigger obj._force_save = True Model.save(obj, force_insert=True) + # We don't want log anything + obj._no_log = True ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object obj._force_delete = True diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 5ccb9c0b..3bb79897 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -2,8 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.core.exceptions import PermissionDenied -from django.db.models.signals import pre_save, pre_delete, post_save, post_delete -from logs import signals as logs_signals from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend @@ -29,7 +27,7 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_save"): + if hasattr(instance, "_no_log"): return user = get_current_authenticated_user() @@ -76,7 +74,7 @@ def pre_delete_object(instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_delete"): + if hasattr(instance, "_no_log"): return user = get_current_authenticated_user() diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a4bfb939..9348a93a 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-31 23:49+0200\n" +"POT-Creation-Date: 2020-04-01 04:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,9 +44,9 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:64 apps/member/models.py:158 +#: apps/member/models.py:66 apps/member/models.py:166 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "" @@ -68,7 +68,7 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "" @@ -251,129 +251,145 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/models.py:26 +#: apps/member/models.py:28 msgid "phone number" msgstr "" -#: apps/member/models.py:32 templates/member/profile_info.html:27 +#: apps/member/models.py:34 templates/member/profile_info.html:27 msgid "section" msgstr "" -#: apps/member/models.py:33 +#: apps/member/models.py:35 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:39 templates/member/profile_info.html:30 +#: apps/member/models.py:41 templates/member/profile_info.html:30 msgid "address" msgstr "" -#: apps/member/models.py:45 +#: apps/member/models.py:47 msgid "paid" msgstr "" -#: apps/member/models.py:50 apps/member/models.py:51 +#: apps/member/models.py:52 apps/member/models.py:53 msgid "user profile" msgstr "" -#: apps/member/models.py:69 templates/member/club_info.html:38 +#: apps/member/models.py:71 templates/member/club_info.html:41 msgid "email" msgstr "" -#: apps/member/models.py:76 +#: apps/member/models.py:78 msgid "parent club" msgstr "" -#: apps/member/models.py:85 +#: apps/member/models.py:87 msgid "require memberships" msgstr "" -#: apps/member/models.py:86 +#: apps/member/models.py:88 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:91 templates/member/club_info.html:31 -msgid "membership fee" +#: apps/member/models.py:93 templates/member/club_info.html:31 +msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:97 templates/member/club_info.html:28 +#: apps/member/models.py:98 templates/member/club_info.html:34 +msgid "membership fee (unpaid students)" +msgstr "" + +#: apps/member/models.py:104 templates/member/club_info.html:28 msgid "membership duration" msgstr "" -#: apps/member/models.py:98 +#: apps/member/models.py:105 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:105 templates/member/club_info.html:22 +#: apps/member/models.py:112 templates/member/club_info.html:22 msgid "membership start" msgstr "" -#: apps/member/models.py:106 +#: apps/member/models.py:113 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:113 templates/member/club_info.html:25 +#: apps/member/models.py:120 templates/member/club_info.html:25 msgid "membership end" msgstr "" -#: apps/member/models.py:114 +#: apps/member/models.py:121 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:143 apps/note/models/notes.py:139 +#: apps/member/models.py:151 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:144 +#: apps/member/models.py:152 msgid "clubs" msgstr "" -#: apps/member/models.py:164 apps/permission/models.py:284 +#: apps/member/models.py:172 apps/permission/models.py:288 msgid "role" msgstr "" -#: apps/member/models.py:165 +#: apps/member/models.py:173 apps/member/models.py:196 msgid "roles" msgstr "" -#: apps/member/models.py:191 +#: apps/member/models.py:200 msgid "membership starts on" msgstr "" -#: apps/member/models.py:195 +#: apps/member/models.py:204 msgid "membership ends on" msgstr "" -#: apps/member/models.py:200 +#: apps/member/models.py:209 msgid "fee" msgstr "" -#: apps/member/models.py:212 +#: apps/member/models.py:221 apps/member/views.py:365 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:224 +#: apps/member/models.py:231 apps/member/views.py:374 +msgid "User is already a member of the club" +msgstr "" + +#: apps/member/models.py:265 msgid "membership" msgstr "" -#: apps/member/models.py:225 +#: apps/member/models.py:266 msgid "memberships" msgstr "" -#: apps/member/views.py:77 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:90 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "" +#: apps/member/views.py:378 apps/member/views.py:410 +msgid "The membership must start after {:%m-%d-%Y}." +msgstr "" + +#: apps/member/views.py:383 apps/member/views.py:415 +msgid "The membership must start before {:%m-%d-%Y}." +msgstr "" + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:128 apps/note/admin.py:163 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -470,7 +486,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:35 +#: apps/note/models/notes.py:211 templates/member/club_info.html:38 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" @@ -532,45 +548,45 @@ msgstr "" msgid "invalidity reason" msgstr "" -#: apps/note/models/transactions.py:146 +#: apps/note/models/transactions.py:147 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:148 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:201 templates/base.html:84 +#: apps/note/models/transactions.py:202 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:221 +#: apps/note/models/transactions.py:222 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:236 +#: apps/note/models/transactions.py:237 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:241 +#: apps/note/models/transactions.py:242 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 +#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:264 +#: apps/note/models/transactions.py:265 msgid "membership transactions" msgstr "" @@ -594,21 +610,21 @@ msgstr "" msgid "Consumptions" msgstr "" -#: apps/permission/models.py:78 apps/permission/models.py:271 +#: apps/permission/models.py:82 apps/permission/models.py:275 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:80 apps/permission/models.py:273 +#: apps/permission/models.py:84 apps/permission/models.py:277 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:93 +#: apps/permission/models.py:97 msgid "rank" msgstr "" -#: apps/permission/models.py:156 +#: apps/permission/models.py:160 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -892,19 +908,15 @@ msgstr "" msgid "days" msgstr "" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:47 msgid "Add member" msgstr "" -#: templates/member/club_info.html:44 templates/note/conso_form.html:121 +#: templates/member/club_info.html:50 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:45 -msgid "Add roles" -msgstr "" - -#: templates/member/club_info.html:48 templates/member/profile_info.html:48 +#: templates/member/club_info.html:54 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f4568da4..aeb565cc 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-31 23:49+0200\n" +"POT-Creation-Date: 2020-04-01 04:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,9 +40,9 @@ msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:64 apps/member/models.py:158 +#: apps/member/models.py:66 apps/member/models.py:166 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "nom" @@ -64,7 +64,7 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" @@ -247,73 +247,77 @@ msgstr "Les logs ne peuvent pas être détruits." msgid "member" msgstr "adhérent" -#: apps/member/models.py:26 +#: apps/member/models.py:28 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:32 templates/member/profile_info.html:27 +#: apps/member/models.py:34 templates/member/profile_info.html:27 msgid "section" msgstr "section" -#: apps/member/models.py:33 +#: apps/member/models.py:35 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:39 templates/member/profile_info.html:30 +#: apps/member/models.py:41 templates/member/profile_info.html:30 msgid "address" msgstr "adresse" -#: apps/member/models.py:45 +#: apps/member/models.py:47 msgid "paid" msgstr "payé" -#: apps/member/models.py:50 apps/member/models.py:51 +#: apps/member/models.py:52 apps/member/models.py:53 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:69 templates/member/club_info.html:38 +#: apps/member/models.py:71 templates/member/club_info.html:41 msgid "email" msgstr "courriel" -#: apps/member/models.py:76 +#: apps/member/models.py:78 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:85 +#: apps/member/models.py:87 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:86 +#: apps/member/models.py:88 msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:91 templates/member/club_info.html:31 -msgid "membership fee" -msgstr "cotisation pour adhérer" +#: apps/member/models.py:93 templates/member/club_info.html:31 +msgid "membership fee (paid students)" +msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:97 templates/member/club_info.html:28 +#: apps/member/models.py:98 templates/member/club_info.html:34 +msgid "membership fee (unpaid students)" +msgstr "cotisation pour adhérer (normalien étudiant)" + +#: apps/member/models.py:104 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:98 +#: apps/member/models.py:105 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:105 templates/member/club_info.html:22 +#: apps/member/models.py:112 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:106 +#: apps/member/models.py:113 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:113 templates/member/club_info.html:25 +#: apps/member/models.py:120 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:114 +#: apps/member/models.py:121 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -321,59 +325,71 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:143 apps/note/models/notes.py:139 +#: apps/member/models.py:151 apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:144 +#: apps/member/models.py:152 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:164 apps/permission/models.py:284 +#: apps/member/models.py:172 apps/permission/models.py:288 msgid "role" msgstr "rôle" -#: apps/member/models.py:165 +#: apps/member/models.py:173 apps/member/models.py:196 msgid "roles" msgstr "rôles" -#: apps/member/models.py:191 +#: apps/member/models.py:200 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:195 +#: apps/member/models.py:204 msgid "membership ends on" -msgstr "l'adhésion finie le" +msgstr "l'adhésion finit le" -#: apps/member/models.py:200 +#: apps/member/models.py:209 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:212 +#: apps/member/models.py:221 apps/member/views.py:365 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:224 +#: apps/member/models.py:231 apps/member/views.py:374 +msgid "User is already a member of the club" +msgstr "L'utilisateur est déjà membre du club" + +#: apps/member/models.py:265 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:225 +#: apps/member/models.py:266 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:77 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:90 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." +#: apps/member/views.py:378 apps/member/views.py:410 +msgid "The membership must start after {:%m-%d-%Y}." +msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." + +#: apps/member/views.py:383 apps/member/views.py:415 +msgid "The membership must begin before {:%m-%d-%Y}." +msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:128 apps/note/admin.py:163 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -471,7 +487,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:35 +#: apps/note/models/notes.py:211 templates/member/club_info.html:38 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" @@ -533,45 +549,45 @@ msgstr "raison" msgid "invalidity reason" msgstr "Motif d'invalidité" -#: apps/note/models/transactions.py:146 +#: apps/note/models/transactions.py:147 msgid "transaction" msgstr "transaction" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:148 msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:201 templates/base.html:84 +#: apps/note/models/transactions.py:202 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:221 +#: apps/note/models/transactions.py:222 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:236 +#: apps/note/models/transactions.py:237 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:241 +#: apps/note/models/transactions.py:242 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 +#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:264 +#: apps/note/models/transactions.py:265 msgid "membership transactions" msgstr "transactions d'adhésion" @@ -595,21 +611,21 @@ msgstr "Transférer de l'argent" msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:78 apps/permission/models.py:271 +#: apps/permission/models.py:82 apps/permission/models.py:275 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:80 apps/permission/models.py:273 +#: apps/permission/models.py:84 apps/permission/models.py:277 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:93 +#: apps/permission/models.py:97 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:156 +#: apps/permission/models.py:160 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -895,19 +911,15 @@ msgstr "Club parent" msgid "days" msgstr "jours" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:47 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:44 templates/note/conso_form.html:121 +#: templates/member/club_info.html:50 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:45 -msgid "Add roles" -msgstr "Ajouter des rôles" - -#: templates/member/club_info.html:48 templates/member/profile_info.html:48 +#: templates/member/club_info.html:54 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -1217,5 +1229,8 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." msgid "Closed remittances" msgstr "Remises fermées" +#~ msgid "Add roles" +#~ msgstr "Ajouter des rôles" + #~ msgid "linked notes" #~ msgstr "notes liées" diff --git a/templates/member/club_form.html b/templates/member/club_form.html index 7abe9db9..9810ccab 100644 --- a/templates/member/club_form.html +++ b/templates/member/club_form.html @@ -15,14 +15,16 @@ require_memberships_obj = $("#id_require_memberships"); if (!require_memberships_obj.is(":checked")) { - $("#div_id_membership_fee").toggle(); + $("#div_id_membership_fee_paid").toggle(); + $("#div_id_membership_fee_unpaid").toggle(); $("#div_id_membership_duration").toggle(); $("#div_id_membership_start").toggle(); $("#div_id_membership_end").toggle(); } require_memberships_obj.change(function () { - $("#div_id_membership_fee").toggle(); + $("#div_id_membership_fee_paid").toggle(); + $("#div_id_membership_fee_unpaid").toggle(); $("#div_id_membership_duration").toggle(); $("#div_id_membership_start").toggle(); $("#div_id_membership_end").toggle(); diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 23a41c1c..ef5c59f1 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -28,8 +28,11 @@
{% trans 'membership duration'|capfirst %}
{{ club.membership_duration }} {% trans "days" %}
-
{% trans 'membership fee'|capfirst %}
-
{{ club.membership_fee|pretty_money }}
+
{% trans 'membership fee (paid students)'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
+ +
{% trans 'membership fee (unpaid students)'|capfirst %}
+
{{ club.membership_fee_unpaid|pretty_money }}
{% endif %}
{% trans 'aliases'|capfirst %}
From 535c493bc7434a36f8f26b355535931cf028440c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:20:47 +0200 Subject: [PATCH 09/19] Fix some issues --- apps/member/models.py | 9 ++++++--- locale/de/LC_MESSAGES/django.po | 11 ++++++++--- locale/fr/LC_MESSAGES/django.po | 15 +++++++-------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 47807976..be4fe7e9 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -5,7 +5,7 @@ import datetime from django.conf import settings from django.contrib.auth.models import User -from django.core.exceptions import ValidationError, PermissionDenied +from django.core.exceptions import ValidationError from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -246,7 +246,7 @@ class Membership(models.Model): self.make_transaction() def make_transaction(self): - if self.transaction is not None or not self.fee: + if not self.fee or MembershipTransaction.objects.filter(membership=self).exists(): return if self.fee: @@ -256,11 +256,14 @@ class Membership(models.Model): destination=self.club.note, quantity=1, amount=self.fee, - reason="Adhésion", + reason="Adhésion " + self.club.name, ) transaction._force_save = True transaction.save(force_insert=True) + def __str__(self): + return _("Membership of {user} for the club {club}").format(user=self.user.username, club=self.club.name, ) + class Meta: verbose_name = _('membership') verbose_name_plural = _('memberships') diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 9348a93a..39f5818c 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-01 04:00+0200\n" +"POT-Creation-Date: 2020-04-01 04:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -362,10 +362,15 @@ msgid "User is already a member of the club" msgstr "" #: apps/member/models.py:265 +#, python-brace-format +msgid "Membership of {user} for the club {club}" +msgstr "" + +#: apps/member/models.py:268 msgid "membership" msgstr "" -#: apps/member/models.py:266 +#: apps/member/models.py:269 msgid "memberships" msgstr "" @@ -382,7 +387,7 @@ msgid "The membership must start after {:%m-%d-%Y}." msgstr "" #: apps/member/views.py:383 apps/member/views.py:415 -msgid "The membership must start before {:%m-%d-%Y}." +msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" #: apps/note/admin.py:120 apps/note/models/transactions.py:94 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index aeb565cc..24f7bf8a 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-01 04:00+0200\n" +"POT-Creation-Date: 2020-04-01 04:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -362,10 +362,15 @@ msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" #: apps/member/models.py:265 +#, python-brace-format +msgid "Membership of {user} for the club {club}" +msgstr "Adhésion de {user} pour le club {club}" + +#: apps/member/models.py:268 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:266 +#: apps/member/models.py:269 msgid "memberships" msgstr "adhésions" @@ -1228,9 +1233,3 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." #: templates/treasury/remittance_list.html:54 msgid "Closed remittances" msgstr "Remises fermées" - -#~ msgid "Add roles" -#~ msgstr "Ajouter des rôles" - -#~ msgid "linked notes" -#~ msgstr "notes liées" From 92ab5ee3af0633f70f52c0212052a9f41d50a978 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:34:42 +0200 Subject: [PATCH 10/19] Fix memberships with clubs without memberships (we always need treasurers...) --- apps/member/models.py | 5 ++++- apps/member/views.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index be4fe7e9..c2f27473 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -128,6 +128,9 @@ class Club(models.Model): This function is called each time the club detail view is displayed. Update the year of the membership dates. """ + if not self.membership_start: + return + today = datetime.date.today() if (today - self.membership_start).days >= 365: @@ -237,7 +240,7 @@ class Membership(models.Model): if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: - self.date_end = self.date_start + datetime.timedelta(days=0x7FFFFFFF) + self.date_end = self.date_start + datetime.timedelta(days=424242) if self.club.membership_end is not None and self.date_end > self.club.membership_end: self.date_end = self.club.membership_end diff --git a/apps/member/views.py b/apps/member/views.py index 226cafab..243ff265 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -374,12 +374,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.add_error('user', _('User is already a member of the club')) return super().form_invalid(form) - if form.instance.date_start < form.instance.club.membership_start: + if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) - if form.instance.date_start > form.instance.club.membership_end: + if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) @@ -406,12 +406,12 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return context def form_valid(self, form): - if form.instance.date_start < form.instance.club.membership_start: + if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) - if form.instance.date_start > form.instance.club.membership_end: + if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) From 356c8588e78586f0a1dc99a4412816888c6ff8fe Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 17:00:06 +0200 Subject: [PATCH 11/19] Users that are not member of the club Kfet can't have a negative balance --- apps/member/models.py | 4 ++-- apps/member/views.py | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index c2f27473..0af52736 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -228,8 +228,8 @@ class Membership(models.Model): if Membership.objects.filter( user=self.user, club=self.club, - date_start__lte=datetime.datetime.now().date(), - date_end__gte=datetime.datetime.now().date(), + date_start__lte=self.date_start, + date_end__gte=self.date_start, ).exists(): raise ValidationError(_('User is already a member of the club')) diff --git a/apps/member/views.py b/apps/member/views.py index 243ff265..d3a1848f 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -358,8 +358,25 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): def form_valid(self, form): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) + user = self.request.user form.instance.club = club + if user.profile.paid: + fee = club.membership_fee_paid + else: + fee = club.membership_fee_unpaid + if user.note.balance < fee and not Membership.objects.filter( + club=2, + user=user, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).exists(): + # Users without a valid Kfet membership can't have a negative balance. + # Club 2 = Kfet (hard-code :'( ) + # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note + form.add_error('user', + _("This user don't have enough money to join this club, and can't have a negative balance.")) + if club.parent_club is not None: if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) @@ -368,8 +385,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): if Membership.objects.filter( user=form.instance.user, club=club, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), + date_start__lte=form.instance.date_start, + date_end__gte=form.instance.date_start, ).exists(): form.add_error('user', _('User is already a member of the club')) return super().form_invalid(form) From 2853fe252b1aedcc8e62372202e8380ccec794bf Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 18:47:56 +0200 Subject: [PATCH 12/19] Renew memberships --- apps/member/models.py | 3 ++ apps/member/tables.py | 37 ++++++++++++++++- apps/member/urls.py | 3 +- apps/member/views.py | 40 +++++++++++++++---- locale/de/LC_MESSAGES/django.po | 71 +++++++++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 71 +++++++++++++++++++++------------ templates/member/club_info.html | 13 ++++-- 7 files changed, 172 insertions(+), 66 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 0af52736..693854af 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -187,11 +187,13 @@ class Membership(models.Model): user = models.ForeignKey( User, on_delete=models.PROTECT, + verbose_name=_("user"), ) club = models.ForeignKey( Club, on_delete=models.PROTECT, + verbose_name=_("club"), ) roles = models.ManyToManyField( @@ -237,6 +239,7 @@ class Membership(models.Model): self.fee = self.club.membership_fee_paid else: self.fee = self.club.membership_fee_unpaid + if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: diff --git a/apps/member/tables.py b/apps/member/tables.py index ec21c712..7365320d 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -1,8 +1,10 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import datetime import django_tables2 as tables from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ from django.urls import reverse_lazy from django.utils.html import format_html from note.templatetags.pretty_money import pretty_money @@ -49,8 +51,39 @@ class MembershipTable(tables.Table): } ) - def render_fee(self, value): - return pretty_money(value) + def render_club(self, value): + s = value.name + if PermissionBackend().has_perm(get_current_authenticated_user(), "member.view_club", value): + s = format_html("{name}", + url=reverse_lazy('member:club_detail', kwargs={"pk": value.pk}), name=s) + + return s + + def render_fee(self, value, record): + t = pretty_money(value) + + # If it is required and if the user has the right, the renew button is displayed. + if record.club.membership_start is not None: + if record.date_start < record.club.membership_start: # If the renew is available + if not Membership.objects.filter( + club=record.club, + user=record.user, + date_start__gte=record.club.membership_start, + date_end__lte=record.club.membership_end, + ).exists(): # If the renew is not yet performed + empty_membership = Membership( + club=record.club, + user=record.user, + date_start=datetime.now().date(), + date_end=datetime.now().date(), + fee=0, + ) + if PermissionBackend().has_perm(get_current_authenticated_user(), + "member:add_membership", empty_membership): # If the user has right + t = format_html(t + ' {text}', + url=reverse_lazy('member:club_renew_membership', + kwargs={"pk": record.pk}), text=_("Renew")) + return t def render_roles(self, record): roles = record.roles.all() diff --git a/apps/member/urls.py b/apps/member/urls.py index 2000a6e4..1214f024 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -10,10 +10,11 @@ urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), path('club/', views.ClubListView.as_view(), name="club_list"), + path('club/create/', views.ClubCreateView.as_view(), name="club_create"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), path('club/manage_roles//', views.ClubManageRolesView.as_view(), name="club_manage_roles"), - path('club/create/', views.ClubCreateView.as_view(), name="club_create"), + path('club/renew_membership//', views.ClubRenewMembershipView.as_view(), name="club_renew_membership"), path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), diff --git a/apps/member/views.py b/apps/member/views.py index d3a1848f..c3f0425c 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -2,19 +2,21 @@ # SPDX-License-Identifier: GPL-3.0-or-later import io -from datetime import datetime +from datetime import datetime, timedelta from PIL import Image from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.auth.views import LoginView +from django.core.exceptions import ValidationError from django.db.models import Q from django.forms import HiddenInput from django.shortcuts import redirect from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, DetailView, UpdateView, TemplateView +from django.views.generic.base import View from django.views.generic.edit import FormMixin from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token @@ -137,8 +139,8 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) - club_list = Membership.objects.all().filter(user=user)\ - .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") + club_list = Membership.objects.filter(user=user, date_end__gte=datetime.today())\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) context['club_list'] = MembershipTable(data=club_list) return context @@ -292,9 +294,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context['history_list'] = HistoryTable(club_transactions) club_member = Membership.objects.filter( club=club, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), - ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() + date_end__gte=datetime.today(), + ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) context['member_list'] = MembershipTable(data=club_member) @@ -366,7 +367,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): else: fee = club.membership_fee_unpaid if user.note.balance < fee and not Membership.objects.filter( - club=2, + club__name="Kfet", user=user, date_start__lte=datetime.now().date(), date_end__gte=datetime.now().date(), @@ -437,3 +438,28 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): def get_success_url(self): return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) + + +class ClubRenewMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, View): + def get(self, *args, **kwargs): + user = self.request.user + membership = Membership.objects.filter(PermissionBackend.filter_queryset(user, Membership, "change"))\ + .filter(pk=self.kwargs["pk"]).get() + + if Membership.objects.filter( + club=membership.club, + user=membership.user, + date_start__gte=membership.club.membership_start, + date_end__lte=membership.club.membership_end, + ).exists(): + raise ValidationError(_("This membership is already renewed")) + + new_membership = Membership.objects.create( + user=user, + club=membership.club, + date_start=membership.date_end + timedelta(days=1), + ) + new_membership.roles.set(membership.roles.all()) + new_membership.save() + + return redirect(reverse_lazy('member:club_detail', kwargs={'pk': membership.club.pk})) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 39f5818c..69cd883e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-01 04:12+0200\n" +"POT-Creation-Date: 2020-04-01 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:66 apps/member/models.py:166 +#: apps/member/models.py:66 apps/member/models.py:169 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -78,7 +78,7 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 #: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -275,7 +275,7 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:71 templates/member/club_info.html:41 +#: apps/member/models.py:71 templates/member/club_info.html:46 msgid "email" msgstr "" @@ -291,11 +291,11 @@ msgstr "" msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:93 templates/member/club_info.html:31 +#: apps/member/models.py:93 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:98 templates/member/club_info.html:34 +#: apps/member/models.py:98 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "" @@ -325,71 +325,86 @@ msgid "" "members can renew their membership." msgstr "" -#: apps/member/models.py:151 apps/note/models/notes.py:139 +#: apps/member/models.py:154 apps/member/models.py:196 +#: apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:152 +#: apps/member/models.py:155 msgid "clubs" msgstr "" -#: apps/member/models.py:172 apps/permission/models.py:288 +#: apps/member/models.py:175 apps/permission/models.py:288 msgid "role" msgstr "" -#: apps/member/models.py:173 apps/member/models.py:196 +#: apps/member/models.py:176 apps/member/models.py:201 msgid "roles" msgstr "" -#: apps/member/models.py:200 +#: apps/member/models.py:205 msgid "membership starts on" msgstr "" -#: apps/member/models.py:204 +#: apps/member/models.py:209 msgid "membership ends on" msgstr "" -#: apps/member/models.py:209 +#: apps/member/models.py:214 msgid "fee" msgstr "" -#: apps/member/models.py:221 apps/member/views.py:365 +#: apps/member/models.py:226 apps/member/views.py:383 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:231 apps/member/views.py:374 +#: apps/member/models.py:236 apps/member/views.py:392 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:265 +#: apps/member/models.py:271 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:268 +#: apps/member/models.py:274 msgid "membership" msgstr "" -#: apps/member/models.py:269 +#: apps/member/models.py:275 msgid "memberships" msgstr "" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/tables.py:73 +msgid "Renew" +msgstr "" + +#: apps/member/views.py:80 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:91 +#: apps/member/views.py:93 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:378 apps/member/views.py:410 +#: apps/member/views.py:379 +msgid "" +"This user don't have enough money to join this club, and can't have a " +"negative balance." +msgstr "" + +#: apps/member/views.py:396 apps/member/views.py:428 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:383 apps/member/views.py:415 +#: apps/member/views.py:401 apps/member/views.py:433 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" +#: apps/member/views.py:455 +msgid "This membership is already renewed" +msgstr "" + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" @@ -491,7 +506,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:38 +#: apps/note/models/notes.py:211 templates/member/club_info.html:43 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" @@ -913,15 +928,19 @@ msgstr "" msgid "days" msgstr "" -#: templates/member/club_info.html:47 +#: templates/member/club_info.html:32 +msgid "membership fee" +msgstr "" + +#: templates/member/club_info.html:52 msgid "Add member" msgstr "" -#: templates/member/club_info.html:50 templates/note/conso_form.html:121 +#: templates/member/club_info.html:55 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:54 templates/member/profile_info.html:48 +#: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 24f7bf8a..76bc90f6 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-01 04:12+0200\n" +"POT-Creation-Date: 2020-04-01 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:66 apps/member/models.py:166 +#: apps/member/models.py:66 apps/member/models.py:169 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -74,7 +74,7 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 #: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -271,7 +271,7 @@ msgstr "payé" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:71 templates/member/club_info.html:41 +#: apps/member/models.py:71 templates/member/club_info.html:46 msgid "email" msgstr "courriel" @@ -287,11 +287,11 @@ msgstr "nécessite des adhésions" msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:93 templates/member/club_info.html:31 +#: apps/member/models.py:93 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:98 templates/member/club_info.html:34 +#: apps/member/models.py:98 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" @@ -325,71 +325,86 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:151 apps/note/models/notes.py:139 +#: apps/member/models.py:154 apps/member/models.py:196 +#: apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:152 +#: apps/member/models.py:155 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:172 apps/permission/models.py:288 +#: apps/member/models.py:175 apps/permission/models.py:288 msgid "role" msgstr "rôle" -#: apps/member/models.py:173 apps/member/models.py:196 +#: apps/member/models.py:176 apps/member/models.py:201 msgid "roles" msgstr "rôles" -#: apps/member/models.py:200 +#: apps/member/models.py:205 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:204 +#: apps/member/models.py:209 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:209 +#: apps/member/models.py:214 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:221 apps/member/views.py:365 +#: apps/member/models.py:226 apps/member/views.py:383 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:231 apps/member/views.py:374 +#: apps/member/models.py:236 apps/member/views.py:392 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:265 +#: apps/member/models.py:271 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:268 +#: apps/member/models.py:274 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:269 +#: apps/member/models.py:275 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/tables.py:73 +msgid "Renew" +msgstr "" + +#: apps/member/views.py:80 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:91 +#: apps/member/views.py:93 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:378 apps/member/views.py:410 +#: apps/member/views.py:379 +msgid "" +"This user don't have enough money to join this club, and can't have a " +"negative balance." +msgstr "" + +#: apps/member/views.py:396 apps/member/views.py:428 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:383 apps/member/views.py:415 +#: apps/member/views.py:401 apps/member/views.py:433 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." +#: apps/member/views.py:455 +msgid "This membership is already renewed" +msgstr "Cette adhésion est déjà renouvelée" + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" @@ -492,7 +507,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:38 +#: apps/note/models/notes.py:211 templates/member/club_info.html:43 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" @@ -916,15 +931,19 @@ msgstr "Club parent" msgid "days" msgstr "jours" -#: templates/member/club_info.html:47 +#: templates/member/club_info.html:32 +msgid "membership fee" +msgstr "cotisation pour adhérer" + +#: templates/member/club_info.html:52 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:50 templates/note/conso_form.html:121 +#: templates/member/club_info.html:55 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:54 templates/member/profile_info.html:48 +#: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" diff --git a/templates/member/club_info.html b/templates/member/club_info.html index ef5c59f1..a781bea8 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -28,11 +28,16 @@
{% trans 'membership duration'|capfirst %}
{{ club.membership_duration }} {% trans "days" %}
-
{% trans 'membership fee (paid students)'|capfirst %}
-
{{ club.membership_fee_paid|pretty_money }}
+ {% if club.membership_fee_paid == club.membership_fee_unpaid %} +
{% trans 'membership fee'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
+ {% else %} +
{% trans 'membership fee (paid students)'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
-
{% trans 'membership fee (unpaid students)'|capfirst %}
-
{{ club.membership_fee_unpaid|pretty_money }}
+
{% trans 'membership fee (unpaid students)'|capfirst %}
+
{{ club.membership_fee_unpaid|pretty_money }}
+ {% endif %} {% endif %}
{% trans 'aliases'|capfirst %}
From 5eb08fd822809563a053a2f89d47c82819c3e83f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 20:14:16 +0200 Subject: [PATCH 13/19] Dynamic user research --- apps/member/filters.py | 33 -------------------------- apps/member/tables.py | 10 +++++++- apps/member/views.py | 24 +++++++++++++------ locale/de/LC_MESSAGES/django.po | 2 +- locale/fr/LC_MESSAGES/django.po | 4 ++-- templates/member/club_list.html | 2 +- templates/member/user_list.html | 42 +++++++++++++++++++++++---------- 7 files changed, 59 insertions(+), 58 deletions(-) delete mode 100644 apps/member/filters.py diff --git a/apps/member/filters.py b/apps/member/filters.py deleted file mode 100644 index 951723e8..00000000 --- a/apps/member/filters.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout, Submit -from django.contrib.auth.models import User -from django.db.models import CharField -from django_filters import FilterSet, CharFilter - - -class UserFilter(FilterSet): - class Meta: - model = User - fields = ['last_name', 'first_name', 'username', 'profile__section'] - filter_overrides = { - CharField: { - 'filter_class': CharFilter, - 'extra': lambda f: { - 'lookup_expr': 'icontains' - } - } - } - - -class UserFilterFormHelper(FormHelper): - form_method = 'GET' - layout = Layout( - 'last_name', - 'first_name', - 'username', - 'profile__section', - Submit('Submit', 'Apply Filter'), - ) diff --git a/apps/member/tables.py b/apps/member/tables.py index 7365320d..a9999c11 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -31,7 +31,11 @@ class ClubTable(tables.Table): class UserTable(tables.Table): section = tables.Column(accessor='profile.section') - solde = tables.Column(accessor='note.balance') + + balance = tables.Column(accessor='note.balance', verbose_name=_("Balance")) + + def render_balance(self, value): + return pretty_money(value) class Meta: attrs = { @@ -40,6 +44,10 @@ class UserTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('last_name', 'first_name', 'username', 'email') model = User + row_attrs = { + 'class': 'table-row', + 'data-href': lambda record: record.pk + } class MembershipTable(tables.Table): diff --git a/apps/member/views.py b/apps/member/views.py index c3f0425c..e507c2cf 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -27,7 +27,6 @@ from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin -from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable, MembershipTable @@ -152,18 +151,29 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): model = User table_class = UserTable template_name = 'member/user_list.html' - filter_class = UserFilter - formhelper_class = UserFilterFormHelper def get_queryset(self, **kwargs): qs = super().get_queryset() - self.filter = self.filter_class(self.request.GET, queryset=qs) - self.filter.form.helper = self.formhelper_class() - return self.filter.qs + if "search" in self.request.GET: + pattern = self.request.GET["search"] + + if not pattern: + return qs.none() + + qs = qs.filter( + Q(first_name__iregex=pattern) + | Q(last_name__iregex=pattern) + | Q(profile__section__iregex=pattern) + | Q(note__alias__name__iregex="^" + pattern) + | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern)) + ) + else: + qs = qs.none() + + return qs def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["filter"] = self.filter return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 69cd883e..16c73f35 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -949,7 +949,7 @@ msgid "search clubs" msgstr "" #: templates/member/club_list.html:12 -msgid "Créer un club" +msgid "Create club" msgstr "" #: templates/member/club_list.html:19 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 76bc90f6..9754fa9c 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -952,8 +952,8 @@ msgid "search clubs" msgstr "Chercher un club" #: templates/member/club_list.html:12 -msgid "Créer un club" -msgstr "" +msgid "Create club" +msgstr "Créer un club" #: templates/member/club_list.html:19 msgid "club listing " diff --git a/templates/member/club_list.html b/templates/member/club_list.html index 7f0b02a1..2653ace8 100644 --- a/templates/member/club_list.html +++ b/templates/member/club_list.html @@ -9,7 +9,7 @@
- {% trans "Créer un club" %} + {% trans "Create club" %}
diff --git a/templates/member/user_list.html b/templates/member/user_list.html index 821ea619..d0eaaedb 100644 --- a/templates/member/user_list.html +++ b/templates/member/user_list.html @@ -2,28 +2,44 @@ {% load render_table from django_tables2 %} {% load crispy_forms_tags%} {% block content %} + -New User +
-
-{% crispy filter.form filter.form.helper %} -
-
-
- {% render_table table %} +
+ {% render_table table %}
-
{% endblock %} {% block extrajavascript %} {% endblock %} From 3f5faa0b0525c9a3331303b6807b08c614885a24 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 20:56:24 +0200 Subject: [PATCH 14/19] Add tab for user list --- apps/member/views.py | 5 ++- apps/note/models/transactions.py | 5 +++ apps/note/tables.py | 10 ++++-- apps/permission/templatetags/perms.py | 48 +++++++++++++++++++++---- templates/activity/activity_detail.html | 10 +++--- templates/base.html | 5 +++ 6 files changed, 68 insertions(+), 15 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index e507c2cf..96550e14 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -170,10 +170,13 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): else: qs = qs.none() - return qs + return qs[:20] def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + + context["title"] = _("Search user") + return context diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index d9b860ae..83f8f914 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -46,12 +46,14 @@ class TransactionTemplate(models.Model): unique=True, error_messages={'unique': _("A template with this name already exist")}, ) + destination = models.ForeignKey( NoteClub, on_delete=models.PROTECT, related_name='+', # no reverse verbose_name=_('destination'), ) + amount = models.PositiveIntegerField( verbose_name=_('amount'), help_text=_('in centimes'), @@ -62,9 +64,12 @@ class TransactionTemplate(models.Model): verbose_name=_('type'), max_length=31, ) + display = models.BooleanField( default=True, + verbose_name=_("display"), ) + description = models.CharField( verbose_name=_('description'), max_length=255, diff --git a/apps/note/tables.py b/apps/note/tables.py index 0d83e3cc..a38beb9a 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -118,7 +118,8 @@ class AliasTable(tables.Table): delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) + attrs={'td': {'class': 'col-sm-1'}}, + verbose_name=_("Delete"),) class ButtonTable(tables.Table): @@ -134,17 +135,20 @@ class ButtonTable(tables.Table): } model = TransactionTemplate + exclude = ('id',) edit = tables.LinkColumn('note:template_update', args=[A('pk')], attrs={'td': {'class': 'col-sm-1'}, 'a': {'class': 'btn btn-sm btn-primary'}}, text=_('edit'), - accessor='pk') + accessor='pk', + verbose_name=_("Edit"),) delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) + attrs={'td': {'class': 'col-sm-1'}}, + verbose_name=_("Delete"),) def render_amount(self, value): return pretty_money(value) diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index aa2feeca..b06fdd9a 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -4,6 +4,7 @@ from django.contrib.contenttypes.models import ContentType from django.template.defaultfilters import stringfilter from django import template +from note.models import Transaction from note_kfet.middlewares import get_current_authenticated_user, get_current_session from permission.backends import PermissionBackend @@ -21,9 +22,7 @@ def not_empty_model_list(model_name): return True if session.get("not_empty_model_list_" + model_name, None): return session.get("not_empty_model_list_" + model_name, None) == 1 - spl = model_name.split(".") - ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) - qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, "view")).all() + qs = model_list(model_name) session["not_empty_model_list_" + model_name] = 1 if qs.exists() else 2 return session.get("not_empty_model_list_" + model_name) == 1 @@ -41,18 +40,55 @@ def not_empty_model_change_list(model_name): return True if session.get("not_empty_model_change_list_" + model_name, None): return session.get("not_empty_model_change_list_" + model_name, None) == 1 - spl = model_name.split(".") - ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) - qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, "change")) + qs = model_list(model_name, "change") session["not_empty_model_change_list_" + model_name] = 1 if qs.exists() else 2 return session.get("not_empty_model_change_list_" + model_name) == 1 +@stringfilter +def model_list(model_name, t="view"): + """ + Return the queryset of all visible instances of the given model. + """ + user = get_current_authenticated_user() + if user is None: + return False + spl = model_name.split(".") + ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) + qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, t)).all() + return qs + + def has_perm(perm, obj): return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) +def can_create_transaction(): + """ + :return: True iff the authenticated user can create a transaction. + """ + user = get_current_authenticated_user() + session = get_current_session() + if user is None: + return False + elif user.is_superuser and session.get("permission_mask", 0) >= 42: + return True + if session.get("can_create_transaction", None): + return session.get("can_create_transaction", None) == 1 + + empty_transaction = Transaction( + source=user.note, + destination=user.note, + quantity=1, + amount=0, + reason="Check permissions", + ) + session["can_create_transaction"] = PermissionBackend().has_perm(user, "note.add_transaction", empty_transaction) + return session.get("can_create_transaction") == 1 + + register = template.Library() register.filter('not_empty_model_list', not_empty_model_list) register.filter('not_empty_model_change_list', not_empty_model_change_list) +register.filter('model_list', model_list) register.filter('has_perm', has_perm) diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 0ed3c719..84182065 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -25,7 +25,7 @@
{% trans 'end date'|capfirst %}
{{ activity.date_end }}
- {% if "view_"|has_perm:activity.creater %} + {% if ".view_"|has_perm:activity.creater %}
{% trans 'creater'|capfirst %}
{{ activity.creater }}
{% endif %} @@ -53,17 +53,17 @@
- {% if activity.open and "change__open"|has_perm:activity %} + {% if activity.open and ".change__open"|has_perm:activity %} {% trans "Entry page" %} {% endif %} - {% if activity.valid and "change__open"|has_perm:activity %} + {% if activity.valid and ".change__open"|has_perm:activity %} {% if activity.open %}{% trans "close"|capfirst %}{% else %}{% trans "open"|capfirst %}{% endif %} {% endif %} - {% if not activity.open and "change__valid"|has_perm:activity %} + {% if not activity.open and ".change__valid"|has_perm:activity %} {% if activity.valid %}{% trans "invalidate"|capfirst %}{% else %}{% trans "validate"|capfirst %}{% endif %} {% endif %} - {% if "view_"|has_perm:activity %} + {% if ".view_"|has_perm:activity %} {% trans "edit"|capfirst %} {% endif %} {% if activity.activity_type.can_invite and not activity_started %} diff --git a/templates/base.html b/templates/base.html index 26903c2f..c44e2467 100644 --- a/templates/base.html +++ b/templates/base.html @@ -84,6 +84,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Transfer' %} {% endif %} + {% if "auth.user"|model_list|length >= 2 %} +
  • + {% trans 'Users' %} +
    • + {% endif %} {% if "member.club"|not_empty_model_list %}
  • {% trans 'Clubs' %} From 5c9c0bbc2a2b05b3d3ee10ac31c4ada127ef665b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 00:30:22 +0200 Subject: [PATCH 15/19] Optimize permissions, use memoization --- apps/logs/signals.py | 4 +- apps/permission/backends.py | 50 ++++++++++++++++++------ apps/permission/decorators.py | 56 +++++++++++++++++++++++++++ apps/permission/models.py | 2 +- apps/permission/signals.py | 4 +- apps/permission/templatetags/perms.py | 10 +---- 6 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 apps/permission/decorators.py diff --git a/apps/logs/signals.py b/apps/logs/signals.py index 37e9ba79..68bf95c0 100644 --- a/apps/logs/signals.py +++ b/apps/logs/signals.py @@ -50,7 +50,7 @@ def save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_save"): + if hasattr(instance, "_no_log"): return # noinspection PyProtectedMember @@ -109,7 +109,7 @@ def delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_delete"): + if hasattr(instance, "_no_log"): return # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP diff --git a/apps/permission/backends.py b/apps/permission/backends.py index b95f8203..ef58403b 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -10,6 +10,7 @@ from django.db.models import Q, F from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club +from .decorators import memoize from .models import Permission @@ -22,6 +23,28 @@ class PermissionBackend(ModelBackend): supports_anonymous_user = False supports_inactive_user = False + @staticmethod + @memoize + def get_raw_permissions(user, t): + """ + Query permissions of a certain type for a user, then memoize it. + :param user: The owner of the permissions + :param t: The type of the permissions: view, change, add or delete + :return: The queryset of the permissions of the user (memoized) grouped by clubs + """ + if isinstance(user, AnonymousUser): + # Unauthenticated users have no permissions + return Permission.objects.none() + + return Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ + .filter( + rolepermissions__role__membership__user=user, + rolepermissions__role__membership__date_start__lte=datetime.date.today(), + rolepermissions__role__membership__date_end__gte=datetime.date.today(), + type=t, + mask__rank__lte=get_current_session().get("permission_mask", 0), + ).distinct('club', 'pk') + @staticmethod def permissions(user, model, type): """ @@ -31,18 +54,16 @@ class PermissionBackend(ModelBackend): :param type: The type of the permissions: view, change, add or delete :return: A generator of the requested permissions """ - for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ - .filter( - rolepermissions__role__membership__user=user, - rolepermissions__role__membership__date_start__lte=datetime.date.today(), - rolepermissions__role__membership__date_end__gte=datetime.date.today(), - model__app_label=model.app_label, # For polymorphic models, we don't filter on model type - type=type, - ).all(): - if not isinstance(model, permission.model.__class__) or not permission.club: + clubs = {} + + for permission in PermissionBackend.get_raw_permissions(user, type): + if not isinstance(model.model_class()(), permission.model.model_class()) or not permission.club: continue - club = Club.objects.get(pk=permission.club) + if permission.club not in clubs: + clubs[permission.club] = club = Club.objects.get(pk=permission.club) + else: + club = clubs[permission.club] permission = permission.about( user=user, club=club, @@ -56,10 +77,10 @@ class PermissionBackend(ModelBackend): F=F, Q=Q ) - if permission.mask.rank <= get_current_session().get("permission_mask", 0): - yield permission + yield permission @staticmethod + @memoize def filter_queryset(user, model, t, field=None): """ Filter a queryset by considering the permissions of a given user. @@ -93,10 +114,15 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query + @memoize def has_perm(self, user_obj, perm, obj=None): if user_obj is None or isinstance(user_obj, AnonymousUser): return False + sess = get_current_session() + if sess is not None and sess.session_key is None: + return Permission.objects.none() + if user_obj.is_superuser and get_current_session().get("permission_mask", 0) >= 42: return True diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py new file mode 100644 index 00000000..b6863f23 --- /dev/null +++ b/apps/permission/decorators.py @@ -0,0 +1,56 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from functools import lru_cache +from time import time + +from django.contrib.sessions.models import Session +from note_kfet.middlewares import get_current_session + + +def memoize(f): + """ + Memoize results and store in sessions + + This decorator is useful for permissions: they are loaded once needed, then stored for next calls. + The storage is contained with sessions since it depends on the selected mask. + """ + sess_funs = {} + last_collect = time() + + def collect(): + """ + Clear cache of results when sessions are invalid, to flush useless data. + This function is called every minute. + """ + nonlocal sess_funs + + new_sess_funs = {} + for sess_key in sess_funs: + if Session.objects.filter(session_key=sess_key).exists(): + new_sess_funs[sess_key] = sess_funs[sess_key] + sess_funs = new_sess_funs + + def func(*args, **kwargs): + nonlocal last_collect + + if time() - last_collect > 60: + # Clear cache + collect() + last_collect = time() + + # If there is no session, then we don't memoize anything. + sess = get_current_session() + if sess is None or sess.session_key is None: + return f(*args, **kwargs) + + sess_key = sess.session_key + if sess_key not in sess_funs: + # lru_cache makes the job of memoization + # We store only the 512 latest data per session. It has to be enough. + sess_funs[sess_key] = lru_cache(512)(f) + return sess_funs[sess_key](*args, **kwargs) + + func.func_name = f.__name__ + + return func \ No newline at end of file diff --git a/apps/permission/models.py b/apps/permission/models.py index b1012159..8aaf416c 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -45,7 +45,7 @@ class InstancedPermission: else: oldpk = obj.pk # Ensure previous models are deleted - self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk") + 1).delete() + self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk")).delete() # Force insertion, no data verification, no trigger obj._force_save = True Model.save(obj, force_insert=True) diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 3bb79897..4ee63ae3 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -27,7 +27,7 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_no_log"): + if hasattr(instance, "_force_save"): return user = get_current_authenticated_user() @@ -74,7 +74,7 @@ def pre_delete_object(instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_no_log"): + if hasattr(instance, "_force_delete"): return user = get_current_authenticated_user() diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index b06fdd9a..4f61fcfe 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -20,11 +20,8 @@ def not_empty_model_list(model_name): return False elif user.is_superuser and session.get("permission_mask", 0) >= 42: return True - if session.get("not_empty_model_list_" + model_name, None): - return session.get("not_empty_model_list_" + model_name, None) == 1 qs = model_list(model_name) - session["not_empty_model_list_" + model_name] = 1 if qs.exists() else 2 - return session.get("not_empty_model_list_" + model_name) == 1 + return qs.exists() @stringfilter @@ -38,11 +35,8 @@ def not_empty_model_change_list(model_name): return False elif user.is_superuser and session.get("permission_mask", 0) >= 42: return True - if session.get("not_empty_model_change_list_" + model_name, None): - return session.get("not_empty_model_change_list_" + model_name, None) == 1 qs = model_list(model_name, "change") - session["not_empty_model_change_list_" + model_name] = 1 if qs.exists() else 2 - return session.get("not_empty_model_change_list_" + model_name) == 1 + return qs.exists() @stringfilter From 8ad464ae0c0731f91f41542a1531c1639bc71928 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 00:42:00 +0200 Subject: [PATCH 16/19] Fix CI --- apps/permission/backends.py | 4 ++-- apps/permission/decorators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index ef58403b..4cc0dd9e 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -10,8 +10,8 @@ from django.db.models import Q, F from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club -from .decorators import memoize +from .decorators import memoize from .models import Permission @@ -43,7 +43,7 @@ class PermissionBackend(ModelBackend): rolepermissions__role__membership__date_end__gte=datetime.date.today(), type=t, mask__rank__lte=get_current_session().get("permission_mask", 0), - ).distinct('club', 'pk') + ).distinct('club', 'pk',) @staticmethod def permissions(user, model, type): diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py index b6863f23..cb8649fd 100644 --- a/apps/permission/decorators.py +++ b/apps/permission/decorators.py @@ -53,4 +53,4 @@ def memoize(f): func.func_name = f.__name__ - return func \ No newline at end of file + return func From be428017090d8cbfe9ffc8859adc98a4f213ddb5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 14:50:28 +0200 Subject: [PATCH 17/19] The memoization doesn't work when objects don't have a primary key. --- apps/member/tables.py | 6 +++--- apps/member/views.py | 2 +- apps/permission/backends.py | 15 +++++++++++++-- apps/permission/decorators.py | 5 ++++- apps/permission/permissions.py | 2 +- apps/permission/signals.py | 8 ++++---- apps/permission/templatetags/perms.py | 4 ++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/apps/member/tables.py b/apps/member/tables.py index a9999c11..c8a510ff 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -61,7 +61,7 @@ class MembershipTable(tables.Table): def render_club(self, value): s = value.name - if PermissionBackend().has_perm(get_current_authenticated_user(), "member.view_club", value): + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.view_club", value): s = format_html("{name}", url=reverse_lazy('member:club_detail', kwargs={"pk": value.pk}), name=s) @@ -86,7 +86,7 @@ class MembershipTable(tables.Table): date_end=datetime.now().date(), fee=0, ) - if PermissionBackend().has_perm(get_current_authenticated_user(), + if PermissionBackend.check_perm(get_current_authenticated_user(), "member:add_membership", empty_membership): # If the user has right t = format_html(t + ' {text}', url=reverse_lazy('member:club_renew_membership', @@ -96,7 +96,7 @@ class MembershipTable(tables.Table): def render_roles(self, record): roles = record.roles.all() s = ", ".join(str(role) for role in roles) - if PermissionBackend().has_perm(get_current_authenticated_user(), "member.change_membership_roles", record): + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.change_membership_roles", record): s = format_html("" + s + "") return s diff --git a/apps/member/views.py b/apps/member/views.py index 96550e14..f695002f 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -299,7 +299,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context = super().get_context_data(**kwargs) club = context["club"] - if PermissionBackend().has_perm(self.request.user, "member.change_club_membership_start", club): + if PermissionBackend.check_perm(self.request.user, "member.change_club_membership_start", club): club.update_membership_dates() club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 4cc0dd9e..4fb7b577 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -114,8 +114,16 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query + @staticmethod @memoize - def has_perm(self, user_obj, perm, obj=None): + def check_perm(user_obj, perm, obj=None): + """ + Check is the given user has the permission over a given object. + The result is then memoized. + Exception: for add permissions, since the object is not hashable since it doesn't have any + primary key, the result is not memoized. Moreover, the right could change + (e.g. for a transaction, the balance of the user could change) + """ if user_obj is None or isinstance(user_obj, AnonymousUser): return False @@ -134,10 +142,13 @@ class PermissionBackend(ModelBackend): perm_field = perm[2] if len(perm) == 3 else None ct = ContentType.objects.get_for_model(obj) if any(permission.applies(obj, perm_type, perm_field) - for permission in self.permissions(user_obj, ct, perm_type)): + for permission in PermissionBackend.permissions(user_obj, ct, perm_type)): return True return False + def has_perm(self, user_obj, perm, obj=None): + return PermissionBackend.check_perm(user_obj, perm, obj) + def has_module_perms(self, user_obj, app_label): return False diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py index cb8649fd..f144935a 100644 --- a/apps/permission/decorators.py +++ b/apps/permission/decorators.py @@ -49,7 +49,10 @@ def memoize(f): # lru_cache makes the job of memoization # We store only the 512 latest data per session. It has to be enough. sess_funs[sess_key] = lru_cache(512)(f) - return sess_funs[sess_key](*args, **kwargs) + try: + return sess_funs[sess_key](*args, **kwargs) + except TypeError: # For add permissions, objects are not hashable (not yet created). Don't memoize this case. + return f(*args, **kwargs) func.func_name = f.__name__ diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py index 7097085f..40321567 100644 --- a/apps/permission/permissions.py +++ b/apps/permission/permissions.py @@ -44,7 +44,7 @@ class StrongDjangoObjectPermissions(DjangoObjectPermissions): perms = self.get_required_object_permissions(request.method, model_cls) # if not user.has_perms(perms, obj): - if not all(PermissionBackend().has_perm(user, perm, obj) for perm in perms): + if not all(PermissionBackend.check_perm(user, perm, obj) for perm in perms): # If the user does not have permissions we need to determine if # they have read permissions to see 403, or not, and simply see # a 404 response. diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 4ee63ae3..bf54b72f 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -44,7 +44,7 @@ def pre_save_object(sender, instance, **kwargs): # We check if the user can change the model # If the user has all right on a model, then OK - if PermissionBackend().has_perm(user, app_label + ".change_" + model_name, instance): + if PermissionBackend.check_perm(user, app_label + ".change_" + model_name, instance): return # In the other case, we check if he/she has the right to change one field @@ -56,11 +56,11 @@ def pre_save_object(sender, instance, **kwargs): # If the field wasn't modified, no need to check the permissions if old_value == new_value: continue - if not PermissionBackend().has_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): + if not PermissionBackend.check_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): raise PermissionDenied else: # We check if the user has right to add the object - has_perm = PermissionBackend().has_perm(user, app_label + ".add_" + model_name, instance) + has_perm = PermissionBackend.check_perm(user, app_label + ".add_" + model_name, instance) if not has_perm: raise PermissionDenied @@ -87,5 +87,5 @@ def pre_delete_object(instance, **kwargs): model_name = model_name_full[1] # We check if the user has rights to delete the object - if not PermissionBackend().has_perm(user, app_label + ".delete_" + model_name, instance): + if not PermissionBackend.check_perm(user, app_label + ".delete_" + model_name, instance): raise PermissionDenied diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index 4f61fcfe..a89c7f49 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -54,7 +54,7 @@ def model_list(model_name, t="view"): def has_perm(perm, obj): - return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) + return PermissionBackend.check_perm(get_current_authenticated_user(), perm, obj) def can_create_transaction(): @@ -77,7 +77,7 @@ def can_create_transaction(): amount=0, reason="Check permissions", ) - session["can_create_transaction"] = PermissionBackend().has_perm(user, "note.add_transaction", empty_transaction) + session["can_create_transaction"] = PermissionBackend.check_perm(user, "note.add_transaction", empty_transaction) return session.get("can_create_transaction") == 1 From 17ea2246ca2afa869acdbf8ace39f125a4519b89 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 15:43:41 +0200 Subject: [PATCH 18/19] Remove useless field in activities --- apps/activity/models.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/activity/models.py b/apps/activity/models.py index e3ff0c2f..ed2d94c9 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -73,15 +73,6 @@ class Activity(models.Model): verbose_name=_('organizer'), ) - note = models.ForeignKey( - 'note.Note', - on_delete=models.PROTECT, - blank=True, - null=True, - related_name='+', - verbose_name=_('note'), - ) - attendees_club = models.ForeignKey( 'member.Club', on_delete=models.PROTECT, @@ -160,9 +151,7 @@ class Entry(models.Model): if insert and self.guest: GuestTransaction.objects.create( source=self.note, - source_alias=self.note.user.username, - destination=self.note, - destination_alias=self.activity.organizer.name, + destination=self.activity.organizer.note, quantity=1, amount=self.activity.activity_type.guest_entry_fee, reason="Invitation " + self.activity.name + " " + self.guest.first_name + " " + self.guest.last_name, From 0cdc8ae004a6d18f366203c9b13946f38e57bb18 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 16:06:58 +0200 Subject: [PATCH 19/19] RolePermissions were missing in the API --- apps/permission/api/serializers.py | 13 ++++++++++++- apps/permission/api/urls.py | 5 +++-- apps/permission/api/views.py | 20 ++++++++++++++++---- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/apps/permission/api/serializers.py b/apps/permission/api/serializers.py index 0a52f4fe..e30ed7dc 100644 --- a/apps/permission/api/serializers.py +++ b/apps/permission/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers -from ..models import Permission +from ..models import Permission, RolePermissions class PermissionSerializer(serializers.ModelSerializer): @@ -15,3 +15,14 @@ class PermissionSerializer(serializers.ModelSerializer): class Meta: model = Permission fields = '__all__' + + +class RolePermissionsSerializer(serializers.ModelSerializer): + """ + REST API Serializer for RolePermissions types. + The djangorestframework plugin will analyse the model `RolePermissions` and parse all fields in the API. + """ + + class Meta: + model = RolePermissions + fields = '__all__' diff --git a/apps/permission/api/urls.py b/apps/permission/api/urls.py index d50344ea..b5d53466 100644 --- a/apps/permission/api/urls.py +++ b/apps/permission/api/urls.py @@ -1,11 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .views import PermissionViewSet +from .views import PermissionViewSet, RolePermissionsViewSet def register_permission_urls(router, path): """ Configure router for permission REST API. """ - router.register(path, PermissionViewSet) + router.register(path + "/permission", PermissionViewSet) + router.register(path + "/roles", RolePermissionsViewSet) diff --git a/apps/permission/api/views.py b/apps/permission/api/views.py index 965e82c9..6a068225 100644 --- a/apps/permission/api/views.py +++ b/apps/permission/api/views.py @@ -4,17 +4,29 @@ from django_filters.rest_framework import DjangoFilterBackend from api.viewsets import ReadOnlyProtectedModelViewSet -from .serializers import PermissionSerializer -from ..models import Permission +from .serializers import PermissionSerializer, RolePermissionsSerializer +from ..models import Permission, RolePermissions class PermissionViewSet(ReadOnlyProtectedModelViewSet): """ REST API View set. - The djangorestframework plugin will get all `Changelog` objects, serialize it to JSON with the given serializer, - then render it on /api/logs/ + The djangorestframework plugin will get all `Permission` objects, serialize it to JSON with the given serializer, + then render it on /api/permission/permission/ """ queryset = Permission.objects.all() serializer_class = PermissionSerializer filter_backends = [DjangoFilterBackend] filterset_fields = ['model', 'type', ] + + +class RolePermissionsViewSet(ReadOnlyProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `RolePermission` objects, serialize it to JSON with the given serializer + then render it on /api/permission/roles/ + """ + queryset = RolePermissions.objects.all() + serializer_class = RolePermissionsSerializer + filter_backends = [DjangoFilterBackend] + filterset_fields = ['role', ]