From a81c3dcedb0af316ba5aa83a348bec31cb1227c2 Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Sun, 3 May 2020 15:22:52 +0200 Subject: [PATCH] Fix imports of TimetableType --- aleksis/apps/chronos/model_extensions.py | 3 ++- aleksis/apps/chronos/util/build.py | 2 +- aleksis/apps/chronos/views.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aleksis/apps/chronos/model_extensions.py b/aleksis/apps/chronos/model_extensions.py index afad135f..1607bd24 100644 --- a/aleksis/apps/chronos/model_extensions.py +++ b/aleksis/apps/chronos/model_extensions.py @@ -5,7 +5,8 @@ from jsonstore import BooleanField from aleksis.core.models import Person, Group, Announcement -from .models import Lesson, LessonPeriod, TimetableType +from .managers import TimetableType +from .models import Lesson, LessonPeriod @Person.property diff --git a/aleksis/apps/chronos/util/build.py b/aleksis/apps/chronos/util/build.py index b8d1fb26..9fbc4ce5 100644 --- a/aleksis/apps/chronos/util/build.py +++ b/aleksis/apps/chronos/util/build.py @@ -6,7 +6,7 @@ from calendarweek import CalendarWeek from django.apps import apps from django.db.models import QuerySet -from aleksis.apps.chronos.models import TimetableType +from aleksis.apps.chronos.managers import TimetableType from aleksis.core.models import Person LessonPeriod = apps.get_model("chronos", "LessonPeriod") diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py index b0e593f5..3ddecc15 100644 --- a/aleksis/apps/chronos/views.py +++ b/aleksis/apps/chronos/views.py @@ -15,7 +15,8 @@ from rules.contrib.views import permission_required from aleksis.core.models import Person, Group, Announcement from aleksis.core.util import messages from .forms import LessonSubstitutionForm -from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room, Holiday, Absence, TimetableType +from .managers import TimetableType +from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room, Holiday, Absence from .tables import LessonsTable from .util.build import build_timetable, build_substitutions_list, build_weekdays from .util.js import date_unix -- GitLab