diff --git a/apps/note/api/views.py b/apps/note/api/views.py index f230a646..977441f7 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -89,9 +89,9 @@ class TransactionTemplateViewSet(ReadProtectedModelViewSet): """ queryset = TransactionTemplate.objects.all() serializer_class = TransactionTemplateSerializer - filter_backends = [DjangoFilterBackend] + filter_backends = [SearchFilter, DjangoFilterBackend] filterset_fields = ['name', 'amount', 'display', 'category', ] - + search_fields = ['$name', ] class TransactionViewSet(ReadProtectedModelViewSet): """ diff --git a/apps/note/tables.py b/apps/note/tables.py index f50379c4..a2044a21 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -82,6 +82,11 @@ class ButtonTable(tables.Table): 'class': 'table table condensed table-striped table-hover' } + row_attrs = { + 'class': 'table-row', + 'data-href': lambda record: record.pk + } + model = TransactionTemplate def render_amount(self, value): diff --git a/apps/note/views.py b/apps/note/views.py index d656d7fc..a8118cb2 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -8,6 +8,7 @@ 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 django.urls import reverse_lazy from permission.backends import PermissionBackend from .forms import TransactionTemplateForm @@ -108,7 +109,7 @@ class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): """ model = TransactionTemplate form_class = TransactionTemplateForm - + success_url = reverse_lazy('template_list') class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): """ @@ -117,6 +118,14 @@ class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): model = TransactionTemplate table_class = ButtonTable + def get_queryset(self): + name = self.request.GET.get('name','') + if (name != ''): + object_list = self.model.objects.filter(name__icontains = name) + else: + object_list = self.model.objects.all() + return object_list + class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): """ diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index e8881988..d1934988 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -1,7 +1,26 @@ {% extends "base.html" %} {% load pretty_money %} +{% load i18n %} {% load render_table from django_tables2 %} {% block content %} -Créer un bouton -{% render_table table %} +
+
+

+ {% trans "search button" %} +

+
+ {% csrf_token %} + +
+ +
+ Créer un bouton +
+
+
+
+ {% render_table table %} +
+
{% endblock %}