From bea7399fe277c2acc2927e49295fe296cb0704c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 22 Nov 2021 20:11:50 +0100 Subject: [PATCH] Fix merge --- .../templates}/odevzdavatko/detail_resitele.html | 0 odevzdavatko/urls.py | 2 ++ personalni/admin.py | 10 ++++++---- seminar/models/tvorba.py | 7 ++++++- 4 files changed, 14 insertions(+), 5 deletions(-) rename {seminar/templates/seminar => odevzdavatko/templates}/odevzdavatko/detail_resitele.html (100%) diff --git a/seminar/templates/seminar/odevzdavatko/detail_resitele.html b/odevzdavatko/templates/odevzdavatko/detail_resitele.html similarity index 100% rename from seminar/templates/seminar/odevzdavatko/detail_resitele.html rename to odevzdavatko/templates/odevzdavatko/detail_resitele.html diff --git a/odevzdavatko/urls.py b/odevzdavatko/urls.py index 477beb2b..bb04f06a 100644 --- a/odevzdavatko/urls.py +++ b/odevzdavatko/urls.py @@ -15,4 +15,6 @@ urlpatterns = [ path('org/reseni/', org_required(viewMethodSwitch(get=views.DetailReseniView.as_view(), post=views.hodnoceniReseniView)), name='odevzdavatko_detail_reseni'), path('org/reseni/all', org_required(views.SeznamReseniView.as_view())), path('org/reseni/akt', org_required(views.SeznamAktualnichReseniView.as_view())), + + path('resitel/reseni/', resitel_or_org_required(views.ResitelReseniView.as_view()), name='odevzdavatko_resitel_reseni'), ] diff --git a/personalni/admin.py b/personalni/admin.py index 113fb99f..36a4ae6e 100644 --- a/personalni/admin.py +++ b/personalni/admin.py @@ -30,13 +30,15 @@ class OsobaAdmin(admin.ModelAdmin): org.save() udelej_orgem.short_description = "Udělej vybraných osob organizátory" -@admin.register(m.Organizator) -class OrganizatorAdmin(admin.ModelAdmin): - search_fields = ['osoba__jmeno', 'osoba__prijmeni', 'osoba__prezdivka'] - class OsobaInline(admin.TabularInline): model = m.Osoba +@admin.register(m.Organizator) +class OrganizatorAdmin(ReverseModelAdmin): + search_fields = ['osoba__jmeno', 'osoba__prijmeni', 'osoba__prezdivka'] + inline_type = 'stacked' + inline_reverse = ['osoba'] + @admin.register(m.Resitel) class ResitelAdmin(ReverseModelAdmin): search_fields = ['osoba__jmeno', 'osoba__prijmeni', 'osoba__prezdivka'] diff --git a/seminar/models/tvorba.py b/seminar/models/tvorba.py index 866f2cbf..d123e021 100644 --- a/seminar/models/tvorba.py +++ b/seminar/models/tvorba.py @@ -72,7 +72,12 @@ class Rocnik(SeminarModelBase): return len(self.verejna_cisla()) > 0 verejne.boolean = True verejne.short_description = 'Veřejný (jen dle čísel)' - + + def neverejna_cisla(self): + vc = [c for c in self.cisla.all() if not c.verejne()] + vc.sort(key=lambda c: c.poradi) + return vc + def verejna_cisla(self): vc = [c for c in self.cisla.all() if c.verejne()] vc.sort(key=lambda c: c.poradi)