From 8e6c932023659b943c0433d7d0d19be11950ed01 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 27 Oct 2020 16:56:47 +0100
Subject: [PATCH] Remove legacy caching methods
---
aleksis/apps/alsijil/forms.py | 5 -----
aleksis/apps/alsijil/model_extensions.py | 2 +-
aleksis/apps/alsijil/models.py | 11 -----------
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 3152b47e3..c39709aa2 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -46,11 +46,6 @@ class PersonalNoteForm(forms.ModelForm):
if self.instance and getattr(self.instance, "person", None):
self.fields["person_name"].initial = str(self.instance.person)
- self.fields["extra_marks"].choices = [(e.id, str(e)) for e in ExtraMark.all]
- self.fields["excuse_type"].choices = [(None, "-----")] + [
- (e.id, str(e)) for e in ExcuseType.all
- ]
-
class SelectForm(forms.Form):
layout = Layout(Row("group", "teacher"))
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index a22cc79e0..fddde6d59 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -245,7 +245,7 @@ def get_extra_marks(
week = self.week
stats = {}
- for extra_mark in ExtraMark.all:
+ for extra_mark in ExtraMark.objects.all():
qs = self.personal_notes.filter(
week=week.week, year=week.year, extra_marks=extra_mark
)
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 91f177d17..5f5cb29da 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -36,12 +36,6 @@ class ExcuseType(ExtensibleModel):
def count_label(self):
return f"{self.short_name}_count"
- @classproperty
- @cache_memoize(3600)
- def all(cls):
- qs = cls.objects.all()
- return qs
-
class Meta:
ordering = ["name"]
verbose_name = _("Excuse type")
@@ -215,11 +209,6 @@ class ExtraMark(ExtensibleModel):
def count_label(self):
return f"{self.short_name}_count"
- @classproperty
- @cache_memoize(3600)
- def all(cls):
- return cls.objects.all()
-
class Meta:
ordering = ["short_name"]
verbose_name = _("Extra mark")
--
GitLab