From f4fe0c98666f87ef79b48200706733d36c0f8840 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 9 Mar 2020 20:59:04 +0100 Subject: [PATCH 01/17] use django_tables2 for transactionTemplate --- apps/note/tables.py | 11 ++++++++++ apps/note/views.py | 8 ++++--- templates/note/transactiontemplate_list.html | 22 +++----------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index e85fcbae..580cb91d 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -54,3 +54,14 @@ class AliasTable(tables.Table): 'td': {'class': 'col-sm-2'}, 'a': {'class': 'btn btn-danger'}}, text='delete', accessor='pk') + +class ButtonTable(tables.Table): + class Meta: + attrs = { + 'class': + 'table table condensed table-striped table-hover' + } + model = TransactionTemplate + + def render_amount(self, value): + return pretty_money(value) diff --git a/apps/note/views.py b/apps/note/views.py index 09846057..a3441ab3 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -8,9 +8,11 @@ from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, ListView, UpdateView +from django_tables2 import SingleTableView + from .forms import TransactionForm, TransactionTemplateForm, ConsoForm from .models import Transaction, TransactionTemplate, Alias, TemplateTransaction - +from .tables import ButtonTable class TransactionCreate(LoginRequiredMixin, CreateView): """ @@ -106,12 +108,12 @@ class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): form_class = TransactionTemplateForm -class TransactionTemplateListView(LoginRequiredMixin, ListView): +class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): """ List TransactionsTemplates """ model = TransactionTemplate - form_class = TransactionTemplateForm + table = ButtonTable class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index 62e4d164..e8881988 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -1,23 +1,7 @@ {% extends "base.html" %} {% load pretty_money %} +{% load render_table from django_tables2 %} {% block content %} - - - - - - - - -{% for object in object_list %} - - - - - - - -{% endfor %} -
IDNomDestinataireMontantCatégorie
{{object.pk}}{{ object.name }}{{ object.destination }}{{ object.amount | pretty_money }}{{ object.template_type }}
-Créer un bouton +Créer un bouton +{% render_table table %} {% endblock %} From 8abc7898957196c5860f3c82d127b60a360e4d98 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 10 Mar 2020 20:17:56 +0100 Subject: [PATCH 02/17] fix parameter name, works better. --- apps/note/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/note/views.py b/apps/note/views.py index a3441ab3..e0105140 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -113,7 +113,7 @@ class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): List TransactionsTemplates """ model = TransactionTemplate - table = ButtonTable + table_class = ButtonTable class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): From 3cdb3f6d3820867c2490a45a9ff379015d4abf32 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 23 Mar 2020 15:28:09 +0100 Subject: [PATCH 03/17] Refactor and comment noteView --- apps/note/urls.py | 2 +- apps/note/views.py | 27 ++++++++++++++++++--------- apps/scripts | 1 + 3 files changed, 20 insertions(+), 10 deletions(-) create mode 160000 apps/scripts diff --git a/apps/note/urls.py b/apps/note/urls.py index fea911f6..59316069 100644 --- a/apps/note/urls.py +++ b/apps/note/urls.py @@ -8,7 +8,7 @@ from .models import Note app_name = 'note' urlpatterns = [ - path('transfer/', views.TransactionCreate.as_view(), name='transfer'), + path('transfer/', views.TransactionCreateView.as_view(), name='transfer'), path('buttons/create/', views.TransactionTemplateCreateView.as_view(), name='template_create'), path('buttons/update//', views.TransactionTemplateUpdateView.as_view(), name='template_update'), path('buttons/', views.TransactionTemplateListView.as_view(), name='template_list'), diff --git a/apps/note/views.py b/apps/note/views.py index e0105140..63d951cb 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -14,12 +14,13 @@ from .forms import TransactionForm, TransactionTemplateForm, ConsoForm from .models import Transaction, TransactionTemplate, Alias, TemplateTransaction from .tables import ButtonTable -class TransactionCreate(LoginRequiredMixin, CreateView): +class TransactionCreateView(LoginRequiredMixin, SingleTableView): """ - Show transfer page + 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` + """ + template_name = "note/transaction_form.html" - TODO: If user have sufficient rights, they can transfer from an other note - """ model = Transaction form_class = TransactionForm @@ -53,13 +54,14 @@ class TransactionCreate(LoginRequiredMixin, CreateView): class NoteAutocomplete(autocomplete.Select2QuerySetView): """ - Auto complete note by aliases + Auto complete note by aliases. Used in every search field for note + ex: :view:`ConsoView`, :view:`TransactionCreateView` """ def get_queryset(self): """ - Quand une personne cherche un alias, une requête est envoyée sur l'API dédiée à l'auto-complétion. - Cette fonction récupère la requête, et renvoie la liste filtrée des aliases. + When someone look for an :models:`note.Alias`, a query is sent to the dedicated API. + This function handles the result and return a filtered list of aliases. """ # Un utilisateur non connecté n'a accès à aucune information if not self.request.user.is_authenticated: @@ -88,6 +90,10 @@ class NoteAutocomplete(autocomplete.Select2QuerySetView): return qs def get_result_label(self, result): + """ + Show the selected alias and the username associated + (aka. ) + """ # Gère l'affichage de l'alias dans la recherche res = result.name note_name = str(result.note) @@ -96,7 +102,9 @@ class NoteAutocomplete(autocomplete.Select2QuerySetView): return res def get_result_value(self, result): - # Le résultat renvoyé doit être l'identifiant de la note, et non de l'alias + """ + The value used for the transactions will be the id of the Note. + """ return str(result.note.pk) @@ -125,7 +133,8 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): class ConsoView(LoginRequiredMixin, CreateView): """ - Consume + 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 = TemplateTransaction template_name = "note/conso_form.html" diff --git a/apps/scripts b/apps/scripts new file mode 160000 index 00000000..b9fdced3 --- /dev/null +++ b/apps/scripts @@ -0,0 +1 @@ +Subproject commit b9fdced3c2ce34168b8f0d6004a20a69ca16e0de From 41a0529d0c168c2d37f3bfb8c2fc0673b472c05a Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 23 Mar 2020 15:35:24 +0100 Subject: [PATCH 04/17] fixin the merge... --- apps/note/tables.py | 2 +- apps/note/views.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index 050c8981..f50379c4 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ from .models.notes import Alias -from .models.transactions import Transaction +from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money diff --git a/apps/note/views.py b/apps/note/views.py index 4f13f749..d656d7fc 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -13,7 +13,7 @@ from permission.backends import PermissionBackend from .forms import TransactionTemplateForm from .models import Transaction, TransactionTemplate, Alias, RecurrentTransaction, NoteSpecial from .models.transactions import SpecialTransaction -from .tables import HistoryTable +from .tables import HistoryTable, ButtonTable class TransactionCreateView(LoginRequiredMixin, SingleTableView): @@ -24,7 +24,6 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): template_name = "note/transaction_form.html" model = Transaction - form_class = TransactionForm # Transaction history table table_class = HistoryTable table_pagination = {"per_page": 50} From 1ce7dc011814ce7df0fc8d14a30e14aa7ff37323 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 23 Mar 2020 15:53:10 +0100 Subject: [PATCH 05/17] reorganize tabs of nav bar --- templates/base.html | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/templates/base.html b/templates/base.html index fae86443..2f07a6cc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -79,6 +79,9 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Consumptions' %} {% endif %} +
  • + {% trans 'Transfer' %} +
    • {% if "member.club"|not_empty_model_list %}
  • {% trans 'Clubs' %} @@ -89,14 +92,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Activities' %}
    • {% endif %} - {% if "note.transactiontemplate"|not_empty_model_change_list %} -
  • - {% trans 'Buttons' %} -
    • - {% endif %} -
  • - {% trans 'Transfer' %} -
      • {% if user.is_authenticated %} From 7cd8a37aec486580c78fa33a343738f82cea424d Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 23 Mar 2020 20:21:25 +0100 Subject: [PATCH 06/17] non dynamic search for button --- apps/note/api/views.py | 4 ++-- apps/note/tables.py | 5 +++++ apps/note/views.py | 11 +++++++++- templates/note/transactiontemplate_list.html | 23 ++++++++++++++++++-- 4 files changed, 38 insertions(+), 5 deletions(-) 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 %} From 33139bdbde84cca159a06d09aabf3e41f3425d59 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 00:07:25 +0100 Subject: [PATCH 07/17] Dynamic search of buttons --- apps/note/tables.py | 3 +- templates/note/transactiontemplate_list.html | 44 +++++++++++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index a2044a21..2986c748 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -80,10 +80,11 @@ class ButtonTable(tables.Table): class Meta: attrs = { 'class': - 'table table condensed table-striped table-hover' + 'table table-bordered condensed table-striped table-hover' } row_attrs = { 'class': 'table-row', + 'id': lambda record: "row-"+str(record.pk), 'data-href': lambda record: record.pk } diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index d1934988..00903e25 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -8,12 +8,7 @@

      {% trans "search button" %}

      -
      - {% csrf_token %} - -
      -
        -
      +
      Créer un bouton @@ -24,3 +19,40 @@ {% endblock %} + +{% block extrajavascript %} + +{% endblock %} From d4b8d35206f9429d501cc4c4e89704284397c5cd Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 20:16:56 +0100 Subject: [PATCH 08/17] check permission with PermissionBackend. taking connection permission mask into account. --- apps/permission/backends.py | 1 + apps/permission/permissions.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index e61b0719..62b0c09f 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -89,6 +89,7 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query + @staticmethod def has_perm(self, user_obj, perm, obj=None): if user_obj is None or isinstance(user_obj, AnonymousUser): return False diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py index d9816a63..9fb36f35 100644 --- a/apps/permission/permissions.py +++ b/apps/permission/permissions.py @@ -41,8 +41,8 @@ class StrongDjangoObjectPermissions(DjangoObjectPermissions): user = request.user perms = self.get_required_object_permissions(request.method, model_cls) - - if not user.has_perms(perms, obj): + # if not user.has_perms(perms, obj): + if not all(PermissionBackend.has_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. From 8ab142c122229b3c264dc22934807c241a51e22a Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 20:25:08 +0100 Subject: [PATCH 09/17] no need to be static after all --- apps/permission/backends.py | 1 - apps/permission/permissions.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 62b0c09f..e61b0719 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -89,7 +89,6 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query - @staticmethod def has_perm(self, user_obj, perm, obj=None): if user_obj is None or isinstance(user_obj, AnonymousUser): return False diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py index 9fb36f35..7959065f 100644 --- a/apps/permission/permissions.py +++ b/apps/permission/permissions.py @@ -42,7 +42,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().has_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. From ba04a6555f429a307f6c908e4a641416110f344b Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 22:12:44 +0100 Subject: [PATCH 10/17] dynamically delete buttons --- apps/note/api/views.py | 3 ++- apps/note/tables.py | 5 ++++ templates/note/transactiontemplate_list.html | 28 +++++++++++++++++--- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/apps/note/api/views.py b/apps/note/api/views.py index 977441f7..d35c3797 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -5,6 +5,7 @@ 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 rest_framework import viewsets from .serializers import NotePolymorphicSerializer, AliasSerializer, TemplateCategorySerializer, \ TransactionTemplateSerializer, TransactionPolymorphicSerializer @@ -81,7 +82,7 @@ class TemplateCategoryViewSet(ReadProtectedModelViewSet): search_fields = ['$name', ] -class TransactionTemplateViewSet(ReadProtectedModelViewSet): +class TransactionTemplateViewSet(viewsets.ModelViewSet): """ REST API View set. The djangorestframework plugin will get all `TransactionTemplate` objects, serialize it to JSON with the given serializer, diff --git a/apps/note/tables.py b/apps/note/tables.py index 2986c748..ad57c265 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -90,5 +90,10 @@ class ButtonTable(tables.Table): model = TransactionTemplate + + delete = tables.TemplateColumn(template_code=""" + """ class AliasTable(tables.Table): @@ -73,9 +73,16 @@ class AliasTable(tables.Table): show_header = False name = tables.Column(attrs={'td': {'class': 'text-center'}}) - delete = tables.TemplateColumn(template_code=delete_template, - extra_context={"delete_trans":_('delete')}, - attrs={'td':{'class': 'col-sm-1'}}) + # delete = tables.TemplateColumn(template_code=delete_template, + # attrs={'td':{'class': 'col-sm-1'}}) + + delete = tables.LinkColumn('member:user_alias_delete', + args=[A('pk')], + attrs={ + 'td': {'class': 'col-sm-2'}, + 'a': {'class': 'btn btn-danger'}}, + text='delete', accessor='pk') + class ButtonTable(tables.Table): class Meta: attrs = { From b3c1032f4f49b32b7e349277abe38d3b2185c614 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 23:27:08 +0100 Subject: [PATCH 14/17] wrap in function for correct behavior --- templates/note/transactiontemplate_list.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index 50421f68..ba0254bc 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -61,7 +61,7 @@ function search_field_moved(secondfield) { // on click of button "delete" , call the API function delete_button(button_id){ $.ajax({ - url:"/api/note/transaction/template/"+button_id, + url:"/api/note/transaction/template/"+button_id+"/", method:"DELETE", headers: {"X-CSRFTOKEN": CSRF_TOKEN} }) @@ -69,7 +69,9 @@ function search_field_moved(secondfield) { addMsg('{% trans "button successfully deleted "%}','success'); $("#buttons_table").load("{% url 'note:template_list' %} #buttons_table"); }) - .fail(addMsg(' {% trans "Unable to delete button "%} #' + button_id,'danger' )); + .fail(function(){ + addMsg(' {% trans "Unable to delete button "%} #' + button_id,'danger' ) + }); } {% endblock %} From 20ea017e960a9060f87b4d0fa5c24e3930b08ec7 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Tue, 24 Mar 2020 23:32:48 +0100 Subject: [PATCH 15/17] row color to show if display --- apps/note/tables.py | 4 ++-- apps/note/views.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index 256ebad3..b2326fe3 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -87,10 +87,10 @@ class ButtonTable(tables.Table): class Meta: attrs = { 'class': - 'table table-bordered condensed table-striped table-hover' + 'table table-bordered condensed table-hover' } row_attrs = { - 'class': 'table-row', + 'class': lambda record: 'table-row ' + 'table-success' if record.display else 'table-danger', 'id': lambda record: "row-"+str(record.pk), 'data-href': lambda record: record.pk } diff --git a/apps/note/views.py b/apps/note/views.py index 8a7d24fd..6ddc8975 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -132,7 +132,7 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): """ model = TransactionTemplate form_class = TransactionTemplateForm - + success_url = reverse_lazy('note:template_list') class ConsoView(LoginRequiredMixin, SingleTableView): """ From 0411646ae69f8e0011e51baf954bfaebf25ac352 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Wed, 25 Mar 2020 00:03:48 +0100 Subject: [PATCH 16/17] make the CI pass and nicer front --- apps/note/tables.py | 29 ++++++++++---------- apps/note/views.py | 10 ++----- templates/note/transactiontemplate_list.html | 14 ++++++---- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index b2326fe3..6e662107 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -56,11 +56,12 @@ class HistoryTable(tables.Table): def render_valid(self, value): return "✔" if value else "✖" + # function delete_button(id) provided in template file -delete_template = """ +DELETE_TEMPLATE = """ """ - + class AliasTable(tables.Table): class Meta: attrs = { @@ -75,7 +76,7 @@ class AliasTable(tables.Table): name = tables.Column(attrs={'td': {'class': 'text-center'}}) # delete = tables.TemplateColumn(template_code=delete_template, # attrs={'td':{'class': 'col-sm-1'}}) - + delete = tables.LinkColumn('member:user_alias_delete', args=[A('pk')], attrs={ @@ -97,16 +98,16 @@ class ButtonTable(tables.Table): model = TransactionTemplate - edit = tables.LinkColumn('note:template_update', - args=[A('pk')], - attrs={ - 'td': {'class': 'col-sm-1'}, - 'a': {'class': 'btn btn-primary'}}, - text=_('edit'), accessor='pk') - - delete = tables.TemplateColumn(template_code=delete_template, - extra_context={"delete_trans":_('delete')}, - attrs={'td':{'class':'col-sm-1'}}) - + edit = tables.LinkColumn('note:template_update', + args=[A('pk')], + attrs={'td': {'class': 'col-sm-1'}, + 'a': {'class': 'btn btn-primary'}}, + text=_('edit'), + accessor='pk') + + delete = tables.TemplateColumn(template_code=DELETE_TEMPLATE, + extra_context={"delete_trans": _('delete')}, + attrs={'td': {'class': 'col-sm-1'}}) + def render_amount(self, value): return pretty_money(value) diff --git a/apps/note/views.py b/apps/note/views.py index 6ddc8975..7d8d80aa 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -111,6 +111,7 @@ class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): form_class = TransactionTemplateForm success_url = reverse_lazy('note:template_list') + class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): """ List TransactionsTemplates @@ -118,14 +119,6 @@ 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): """ @@ -134,6 +127,7 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): form_class = TransactionTemplateForm success_url = reverse_lazy('note:template_list') + class ConsoView(LoginRequiredMixin, SingleTableView): """ The Magic View that make people pay their beer and burgers. diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index ba0254bc..043a06e9 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -14,12 +14,14 @@
      -
      -
      -
      {% trans "buttons listing "%}
      -
      -
      - {% render_table table %} +
      +
      +
      +
      {% trans "buttons listing "%}
      +
      +
      + {% render_table table %} +
      From f85f292d5b33b147613b11e0ef64c34b4ba6f61d Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Wed, 25 Mar 2020 00:12:56 +0100 Subject: [PATCH 17/17] linter compliance --- apps/note/api/views.py | 1 + apps/note/tables.py | 4 +++- apps/note/views.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/note/api/views.py b/apps/note/api/views.py index d35c3797..fc4a0e8f 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -94,6 +94,7 @@ class TransactionTemplateViewSet(viewsets.ModelViewSet): filterset_fields = ['name', 'amount', 'display', 'category', ] search_fields = ['$name', ] + class TransactionViewSet(ReadProtectedModelViewSet): """ REST API View set. diff --git a/apps/note/tables.py b/apps/note/tables.py index 6e662107..20054d2c 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -62,6 +62,7 @@ DELETE_TEMPLATE = """ """ + class AliasTable(tables.Table): class Meta: attrs = { @@ -84,6 +85,7 @@ class AliasTable(tables.Table): 'a': {'class': 'btn btn-danger'}}, text='delete', accessor='pk') + class ButtonTable(tables.Table): class Meta: attrs = { @@ -92,7 +94,7 @@ class ButtonTable(tables.Table): } row_attrs = { 'class': lambda record: 'table-row ' + 'table-success' if record.display else 'table-danger', - 'id': lambda record: "row-"+str(record.pk), + 'id': lambda record: "row-" + str(record.pk), 'data-href': lambda record: record.pk } diff --git a/apps/note/views.py b/apps/note/views.py index 7d8d80aa..ddf5ee6f 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType from django.db.models import Q from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, ListView, UpdateView +from django.views.generic import CreateView, UpdateView from django_tables2 import SingleTableView from django.urls import reverse_lazy from permission.backends import PermissionBackend