ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 18:08:21 +02:00
Code Issues Releases Wiki Activity

Fix CI

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-03-20 02:14:43 +01:00
parent 0ce6cd88b3
commit 3f2b21f7f4
13 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/note/api/serializers.py
View File

@ -4,8 +4,6 @@
from rest_framework import serializers
from rest_polymorphic.serializers import PolymorphicSerializer
from member.backends import PermissionBackend
from note_kfet.middlewares import get_current_authenticated_user
from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias
from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \
RecurrentTransaction, SpecialTransaction
@ -83,9 +81,6 @@ class AliasSerializer(serializers.ModelSerializer):
fields = '__all__'
read_only_fields = ('note', )
def get_note(self, alias):
return alias.note.id
class NotePolymorphicSerializer(PolymorphicSerializer):
model_serializer_mapping = {

2
apps/note/api/views.py
View File

@ -4,8 +4,8 @@
from django.db.models import Q
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework.filters import OrderingFilter, SearchFilter
from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
from .serializers import NotePolymorphicSerializer, AliasSerializer, TemplateCategorySerializer, \
TransactionTemplateSerializer, TransactionPolymorphicSerializer
from ..models.notes import Note, Alias

14
apps/note/views.py
View File

@ -8,8 +8,8 @@ from django.db.models import Q
from django.utils.translation import gettext_lazy as _
from django.views.generic import CreateView, ListView, UpdateView
from django_tables2 import SingleTableView
from member.backends import PermissionBackend
from .forms import TransactionTemplateForm
from .models import Transaction, TransactionTemplate, Alias, RecurrentTransaction, NoteSpecial
from .models.transactions import SpecialTransaction
@ -27,9 +27,9 @@ class TransactionCreate(LoginRequiredMixin, SingleTableView):
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]
return Transaction.objects.filter(PermissionBackend.filter_queryset(
self.request.user, Transaction, "view")
).order_by("-id").all()[:50]
def get_context_data(self, **kwargs):
"""
@ -137,9 +137,9 @@ class ConsoView(LoginRequiredMixin, SingleTableView):
"""
context = super().get_context_data(**kwargs)
from django.db.models import Count
buttons = TransactionTemplate.objects.filter(PermissionBackend()
.filter_queryset(self.request.user, TransactionTemplate, "view")) \
.filter(display=True).annotate(clicks=Count('recurrenttransaction')).order_by('category__name', 'name')
buttons = TransactionTemplate.objects.filter(
PermissionBackend().filter_queryset(self.request.user, TransactionTemplate, "view")
).filter(display=True).annotate(clicks=Count('recurrenttransaction')).order_by('category__name', 'name')
context['transaction_templates'] = buttons
context['most_used'] = buttons.order_by('-clicks', 'name')[:10]
context['title'] = _("Consumptions")