From e470aaedaad49d0b30204ea360c24ed878284f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Mar 2022 20:49:48 +0100 Subject: [PATCH] =?UTF-8?q?Zachov=C3=A1n=C3=AD=20=C4=8Dasov=C3=A9=20set?= =?UTF-8?q?=C5=99=C3=ADzenosti=20korekturov=C3=A1tka?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- korektury/models.py | 2 ++ korektury/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/korektury/models.py b/korektury/models.py index 240323a8..42e0ad6e 100644 --- a/korektury/models.py +++ b/korektury/models.py @@ -5,6 +5,7 @@ from django.utils import timezone from django.conf import settings from django.utils.encoding import force_text from django.core.exceptions import ObjectDoesNotExist +from django.utils.functional import cached_property from django.utils.text import get_valid_filename from seminar.models import Organizator @@ -122,6 +123,7 @@ class KorekturovanePDF(models.Model): # uložíme png a změněný počet stran self.convert() + @cached_property def cislo_a_tema(self): nazev_split = self.nazev.split() try: diff --git a/korektury/views.py b/korektury/views.py index 97a34dbf..b7a47100 100644 --- a/korektury/views.py +++ b/korektury/views.py @@ -59,7 +59,7 @@ class KorekturySeskupeneListView(KorekturyAktualniListView): # {% regroup %} potřebuje dostat správně setříděné názvy, aby nedělal duplikáty def get_queryset(self, *args, **kwargs): qs = super().get_queryset(**kwargs) - return qs.order_by('nazev') + return reversed(sorted(qs, key=lambda it: it.cislo_a_tema)) ### Korektury class KorekturyView(generic.TemplateView):