Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • AlekSIS/official/AlekSIS-App-Alsijil
  • sunweaver/AlekSIS-App-Alsijil
  • 8tincsoVluke/AlekSIS-App-Alsijil
  • perfreicpo/AlekSIS-App-Alsijil
  • noifobarep/AlekSIS-App-Alsijil
  • 7ingannisdo/AlekSIS-App-Alsijil
  • unmruntartpa/AlekSIS-App-Alsijil
  • balrorebta/AlekSIS-App-Alsijil
  • comliFdifwa/AlekSIS-App-Alsijil
  • 3ranaadza/AlekSIS-App-Alsijil
10 results
Show changes
Commits on Source (7)
......@@ -6,6 +6,15 @@ 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.
* The redirection to generated class register PDF printouts did not work.
`3.0b0`_ - 2022-02-28
---------------------
......
......@@ -66,7 +66,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 +437,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"]
......
......@@ -41,7 +41,7 @@ from aleksis.core.mixins import (
from aleksis.core.models import Group, PDFFile, Person, SchoolTerm
from aleksis.core.util import messages
from aleksis.core.util.celery_progress import render_progress_page
from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional
from aleksis.core.util.core_helpers import get_site_preferences, has_person, objectgetter_optional
from aleksis.core.util.predicates import check_global_permission
from .filters import PersonalNoteFilter
......@@ -642,8 +642,11 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
group = get_object_or_404(Group, pk=id_)
file_object = PDFFile.objects.create()
if has_person(request):
file_object.person = request.user.person
file_object.save()
redirect_url = reverse("redirect_to_pdf_file", args=[file_object.pk])
redirect_url = f"/pdfs/{file_object.pk}"
result = generate_full_register_printout.delay(group.pk, file_object.pk)
......