Skip to content
Snippets Groups Projects
Commit eba8450c authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Fix models ForeignKeys, move search index to core

parent febc825e
No related branches found
No related tags found
1 merge request!284Resolve "[3.0] Drop Room from model"
Pipeline #103669 failed
......@@ -550,7 +550,7 @@ class LessonPeriod(WeekAnnotationMixin, TeacherPropertiesMixin, ExtensibleModel)
else:
return self.lesson.teachers
def get_room(self) -> Optional[core.Room]:
def get_room(self) -> Optional[Room]:
if self.get_substitution() and self.get_substitution().room:
return self.get_substitution().room
else:
......
from aleksis.core.models import Room
from aleksis.core.util.search import Indexable, SearchIndex
class RoomIndex(SearchIndex, Indexable):
"""Haystack index for searching rooms."""
model = Room
......@@ -7,7 +7,7 @@ from django.http import HttpRequest, HttpResponse, HttpResponseNotFound
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils import timezone
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.views.decorators.cache import never_cache
import reversion
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment