diff --git a/apps/member/views.py b/apps/member/views.py
index 82510c6535dead932ac0df552279d9aa78209cd1..bcaca3352fb6a49d75407928324d2bd717d4c470 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -6,22 +6,18 @@ import io
from PIL import Image
from dal import autocomplete
from django.conf import settings
-from django.contrib import messages
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.http import HttpResponseRedirect
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, DeleteView
+from django.views.generic import CreateView, DetailView, UpdateView, TemplateView
from django.views.generic.edit import FormMixin
from django_tables2.views import SingleTableView
from rest_framework.authtoken.models import Token
from note.forms import ImageForm
-#from note.forms import AliasForm, ImageForm
from note.models import Alias, NoteUser
from note.models.transactions import Transaction
from note.tables import HistoryTable, AliasTable
@@ -168,12 +164,12 @@ class UserListView(LoginRequiredMixin, SingleTableView):
context["filter"] = self.filter
return context
-
+
class ProfileAliasView(LoginRequiredMixin, DetailView):
model = User
template_name = 'member/profile_alias.html'
context_object_name = 'user_object'
-
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
note = context['object'].note
@@ -326,11 +322,12 @@ class ClubDetailView(LoginRequiredMixin, DetailView):
context['member_list'] = club_member
return context
+
class ClubAliasView(LoginRequiredMixin, DetailView):
model = Club
template_name = 'member/club_alias.html'
context_object_name = 'club'
-
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
note = context['object'].note
@@ -364,6 +361,7 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView):
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.get(pk=self.kwargs["pk"])
context = super().get_context_data(**kwargs)
diff --git a/apps/note/api/views.py b/apps/note/api/views.py
index e70eb49e3dfbf0c6584ecd209a17719fddac4083..049f873663108a88ebfee9d57cd39a22ed290085 100644
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -8,7 +8,6 @@ from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework import viewsets
from rest_framework.response import Response
from rest_framework import status
-
from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
from .serializers import NotePolymorphicSerializer, AliasSerializer, TemplateCategorySerializer, \
@@ -60,19 +59,19 @@ class AliasViewSet(ReadProtectedModelViewSet):
def get_serializer_class(self):
serializer_class = self.serializer_class
if self.request.method in ['PUT', 'PATCH']:
- #alias owner cannot be change once establish
+ # alias owner cannot be change once establish
setattr(serializer_class.Meta, 'read_only_fields', ('note',))
return serializer_class
-
+
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
try:
self.perform_destroy(instance)
except ValidationError as e:
print(e)
- return Response({e.code:e.message},status.HTTP_400_BAD_REQUEST)
+ return Response({e.code: e.message}, status.HTTP_400_BAD_REQUEST)
return Response(status=status.HTTP_204_NO_CONTENT)
-
+
def get_queryset(self):
"""
Parse query and apply filters.
diff --git a/apps/note/forms.py b/apps/note/forms.py
index 60252ad54c9e5abaff5265366a2eed77fd38a0bb..18bcf7120f0d5d5157570cace0156a3f602794ec 100644
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -5,7 +5,6 @@ from dal import autocomplete
from django import forms
from django.utils.translation import gettext_lazy as _
-from .models import Alias
from .models import TransactionTemplate
diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py
index 43faabfe59aedf8dc71ae3bf85139c8967eea3fd..9282bde94ca91264b5a5b0480fe61d5f02684e9a 100644
--- a/apps/note/models/notes.py
+++ b/apps/note/models/notes.py
@@ -242,10 +242,10 @@ class Alias(models.Model):
pass
self.normalized_name = normalized_name
- def save(self,*args,**kwargs):
+ def save(self, *args, **kwargs):
self.normalized_name = self.normalize(self.name)
- super().save(*args,**kwargs)
-
+ super().save(*args, **kwargs)
+
def delete(self, using=None, keep_parents=False):
if self.name == str(self.note):
raise ValidationError(_("You can't delete your main alias."),
diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index c6b8baa633fdbe7abba189a022f34c75b2a1379d..d1dcd7887eb62c36f7235e90d0b12454c80ce58e 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from django.db import models
-from django.db.models import F
from django.urls import reverse
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
diff --git a/apps/note/tables.py b/apps/note/tables.py
index 201b6c43cc3fa4e9f41bd20f5cee2447ee7d83a5..0d83e3cc574c49bfcb6076b4ede4b542953b6cd6 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -106,9 +106,8 @@ DELETE_TEMPLATE = """
class AliasTable(tables.Table):
class Meta:
attrs = {
- 'class':
- 'table table condensed table-striped table-hover',
- 'id':"alias_table"
+ 'class': 'table table condensed table-striped table-hover',
+ 'id': "alias_table"
}
model = Alias
fields = ('name',)
@@ -118,9 +117,8 @@ class AliasTable(tables.Table):
name = tables.Column(attrs={'td': {'class': 'text-center'}})
delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE,
- extra_context={"delete_trans": _('delete')},
- attrs={'td': {'class': 'col-sm-1'}})
-
+ extra_context={"delete_trans": _('delete')},
+ attrs={'td': {'class': 'col-sm-1'}})
class ButtonTable(tables.Table):
@@ -145,8 +143,8 @@ class ButtonTable(tables.Table):
accessor='pk')
delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE,
- extra_context={"delete_trans": _('delete')},
- attrs={'td': {'class': 'col-sm-1'}})
+ extra_context={"delete_trans": _('delete')},
+ attrs={'td': {'class': 'col-sm-1'}})
def render_amount(self, value):
return pretty_money(value)