diff --git a/aleksis/apps/alsijil/data_checks.py b/aleksis/apps/alsijil/data_checks.py index 9f0ffb8330fceaa9fb6e5de3641b788b3ea8d430..a45765e5e377ca94c61d1b9c4f9c7b707e86125b 100644 --- a/aleksis/apps/alsijil/data_checks.py +++ b/aleksis/apps/alsijil/data_checks.py @@ -21,7 +21,7 @@ class DeleteRelatedObjectSolveOption(SolveOption): check_result.delete() -class SetGroupsOfPersonWithCurrentGroupsOfPersonSolveOption(SolveOption): +class SetGroupsWithCurrentGroupsSolveOption(SolveOption): name = "set_groups_of_person" verbose_name = _("Set current groups") @@ -70,7 +70,7 @@ class NoGroupsOfPersonsSetInPersonalNotesDataCheck(DataCheck): verbose_name = _("Ensure that 'groups_of_person' is set for every personal note") problem_name = _("The personal note has no group in 'groups_of_person'.") solve_options = { - SetGroupsOfPersonWithCurrentGroupsOfPersonSolveOption.name: SetGroupsOfPersonWithCurrentGroupsOfPersonSolveOption, + SetGroupsWithCurrentGroupsSolveOption.name: SetGroupsWithCurrentGroupsSolveOption, DeleteRelatedObjectSolveOption.name: DeleteRelatedObjectSolveOption, IgnoreSolveOption.name: IgnoreSolveOption, } diff --git a/aleksis/apps/alsijil/preferences.py b/aleksis/apps/alsijil/preferences.py index 62e97cbdd4a94305f41c1553d3de2e35d3ba3395..07ed2153a26e8b5af09131dc464b9d6ab4f7b74e 100644 --- a/aleksis/apps/alsijil/preferences.py +++ b/aleksis/apps/alsijil/preferences.py @@ -1,9 +1,8 @@ from django.utils.translation import gettext as _ from dynamic_preferences.preferences import Section -from dynamic_preferences.types import BooleanPreference, ModelMultipleChoicePreference +from dynamic_preferences.types import BooleanPreference -from aleksis.core.models import Person from aleksis.core.registries import site_preferences_registry alsijil = Section("alsijil", verbose_name=_("Class register")) diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index ee2155e6eb33f012a36d08a692779f03d735576e..21703feaf1a8aa8bc499ed11e3864a916520c6b2 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -1,13 +1,13 @@ from datetime import date, datetime, timedelta -from typing import Any, Dict, Optional +from typing import Optional from django.core.exceptions import PermissionDenied -from django.db.models import Count, Exists, OuterRef, Prefetch, Q, QuerySet, Subquery, Sum +from django.db.models import Count, Exists, OuterRef, Prefetch, Q, Subquery, Sum from django.http import Http404, HttpRequest, HttpResponse, HttpResponseNotFound from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse, reverse_lazy from django.utils.translation import ugettext as _ -from django.views.generic import DetailView, ListView +from django.views.generic import DetailView import reversion from calendarweek import CalendarWeek @@ -21,11 +21,7 @@ from aleksis.apps.chronos.util.date import get_weeks_for_year, week_weekday_to_d from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView from aleksis.core.models import Group, Person, SchoolTerm from aleksis.core.util import messages -from aleksis.core.util.core_helpers import ( - get_site_preferences, - is_celery_enabled, - objectgetter_optional, -) +from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional from .forms import ( ExcuseTypeForm,