From ccfc1e74ac22315dbf145d455f1273a4d28929b8 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 10 Aug 2020 15:30:39 +0200 Subject: [PATCH] Reorder import statements of apps/activity --- apps/activity/admin.py | 2 +- apps/activity/api/serializers.py | 2 +- apps/activity/api/urls.py | 2 +- apps/activity/api/views.py | 6 +++--- apps/activity/forms.py | 4 ++-- apps/activity/models.py | 2 +- apps/activity/tables.py | 2 +- apps/activity/views.py | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/activity/admin.py b/apps/activity/admin.py index 7f40b421..705ac206 100644 --- a/apps/activity/admin.py +++ b/apps/activity/admin.py @@ -4,7 +4,7 @@ from django.contrib import admin from note_kfet.admin import admin_site -from .models import Activity, ActivityType, Guest, Entry +from .models import Activity, ActivityType, Entry, Guest @admin.register(Activity, site=admin_site) diff --git a/apps/activity/api/serializers.py b/apps/activity/api/serializers.py index 2f257de0..d259324d 100644 --- a/apps/activity/api/serializers.py +++ b/apps/activity/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers -from ..models import ActivityType, Activity, Guest, Entry, GuestTransaction +from ..models import Activity, ActivityType, Entry, Guest, GuestTransaction class ActivityTypeSerializer(serializers.ModelSerializer): diff --git a/apps/activity/api/urls.py b/apps/activity/api/urls.py index 3a2495fb..be769932 100644 --- a/apps/activity/api/urls.py +++ b/apps/activity/api/urls.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .views import ActivityTypeViewSet, ActivityViewSet, GuestViewSet, EntryViewSet +from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet def register_activity_urls(router, path): diff --git a/apps/activity/api/views.py b/apps/activity/api/views.py index 764f2ac3..8d555b3b 100644 --- a/apps/activity/api/views.py +++ b/apps/activity/api/views.py @@ -1,12 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from api.viewsets import ReadProtectedModelViewSet from django_filters.rest_framework import DjangoFilterBackend from rest_framework.filters import SearchFilter -from api.viewsets import ReadProtectedModelViewSet -from .serializers import ActivityTypeSerializer, ActivitySerializer, GuestSerializer, EntrySerializer -from ..models import ActivityType, Activity, Guest, Entry +from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer +from ..models import Activity, ActivityType, Entry, Guest class ActivityTypeViewSet(ReadProtectedModelViewSet): diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 4f03f32a..c05330ae 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -8,8 +8,8 @@ from django.contrib.contenttypes.models import ContentType from django.utils import timezone from django.utils.translation import gettext_lazy as _ from member.models import Club -from note.models import NoteUser, Note -from note_kfet.inputs import DateTimePickerInput, Autocomplete +from note.models import Note, NoteUser +from note_kfet.inputs import Autocomplete, DateTimePickerInput from .models import Activity, Guest diff --git a/apps/activity/models.py b/apps/activity/models.py index e576b9d9..86c30656 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -10,8 +10,8 @@ from django.db import models from django.db.models import Q from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from rest_framework.exceptions import ValidationError from note.models import NoteUser, Transaction +from rest_framework.exceptions import ValidationError class ActivityType(models.Model): diff --git a/apps/activity/tables.py b/apps/activity/tables.py index b63c3dd7..a1ede713 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -7,7 +7,7 @@ import django_tables2 as tables from django_tables2 import A from note.templatetags.pretty_money import pretty_money -from .models import Activity, Guest, Entry +from .models import Activity, Entry, Guest class ActivityTable(tables.Table): diff --git a/apps/activity/views.py b/apps/activity/views.py index 033cec3e..170f8003 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -7,16 +7,16 @@ from django.contrib.contenttypes.models import ContentType from django.db.models import F, Q from django.urls import reverse_lazy from django.utils import timezone -from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ +from django.views.generic import CreateView, DetailView, TemplateView, UpdateView from django_tables2.views import SingleTableView -from note.models import NoteUser, Alias, NoteSpecial +from note.models import Alias, NoteSpecial, NoteUser 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 +from .models import Activity, Entry, Guest +from .tables import ActivityTable, EntryTable, GuestTable class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):