diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1ee95a29fdd2e6c58458e3542e8be7a6605aecde..2c77d1f1345d56cc7d4d7cf2306a5e853e67b2b4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. +Unreleased +---------- + +Fixed +~~~~~ +* In some cases, pages showing the count of extra marks and lessons with custom excuse types of + persons threw an error. + `3.0b0`_ - 2022-02-28 --------------------- diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index b504a294164a6388099148fda5149091767577a7..615b28b360e661e2a5e2c784a10069de6c6a43bd 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -1,12 +1,14 @@ from datetime import date from typing import Optional, Union from urllib.parse import urlparse +from uuid import uuid4 from django.db import models from django.db.models.constraints import CheckConstraint from django.db.models.query_utils import Q from django.urls import reverse from django.utils.formats import date_format +from django.utils.text import slugify from django.utils.translation import gettext_lazy as _ from calendarweek import CalendarWeek @@ -66,7 +68,7 @@ class ExcuseType(ExtensibleModel): @property def count_label(self): - return f"{self.short_name}_count" + return f"excuse_type_{self.id}_count" class Meta: ordering = ["name"] @@ -437,7 +439,7 @@ class ExtraMark(ExtensibleModel): @property def count_label(self): - return f"{self.short_name}_count" + return f"extra_mark_{self.id}_count" class Meta: ordering = ["short_name"]