From 687b6d37b2cbe434a63bd226a80bebd56bb72e1d Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Tue, 30 Apr 2019 21:46:57 +0200 Subject: [PATCH 1/2] Fix ReseniAdmin --- seminar/admin.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/seminar/admin.py b/seminar/admin.py index ceff6759..70a42c9f 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -325,14 +325,14 @@ admin.site.register(Rocnik, RocnikAdmin) class ReseniAdmin(VersionAdmin): #form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['problem', 'resitele'], fields=['problem', 'resitele']) fieldsets = [ - (None, {'fields': ['problem', 'resitele', 'forma', 'body', 'cislo_body', 'timestamp']}), + (None, {'fields': ['problem__set', 'resitele__set', 'forma', 'cas_doruceni']}), (u'Poznámky', {'fields': ['poznamka']}), ] - readonly_fields = ['timestamp'] - list_display = ['problem', 'resitele', 'forma', 'body', 'timestamp', 'cislo_body'] - list_filter = ['body', 'timestamp', 'forma'] + readonly_fields = ['cas_doruceni'] + list_display = [ProblemInline, ResitelInline, 'forma', 'cas_doruceni'] + list_filter = ['cas_doruceni', 'forma'] search_fields = [] - inlines = [PrilohaReseniInline] + inlines = [PrilohaReseniInline,ProblemInline,ResitelInline] view_on_site = False def get_queryset(self, request): From 6142f4a979ad68ed1d5a60bc959c84a2184a461c Mon Sep 17 00:00:00 2001 From: LEdoian Date: Tue, 30 Apr 2019 21:48:46 +0200 Subject: [PATCH 2/2] Admin: Fix ResitelInline --- seminar/admin.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/seminar/admin.py b/seminar/admin.py index ceff6759..281b5534 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -76,11 +76,20 @@ def create_modeladmin(modeladmin, model, name = None, verbose_name = None, verbo class ResitelInline(admin.TabularInline): model = Resitel - fields = ['jmeno', 'prijmeni', 'skola', 'mesto', 'rok_maturity', ] - readonly_fields = ['jmeno', 'prijmeni', 'skola', 'mesto', 'rok_maturity', ] + fields = ['osoba_jmeno', 'osoba_prijmeni', 'skola', 'osoba_mesto', 'rok_maturity', ] + readonly_fields = ['osoba_jmeno', 'osoba_prijmeni', 'skola', 'osoba_mesto', 'rok_maturity', ] extra = 0 view_on_site = False + def osoba_jmeno(self, obj): + return obj.osoba.jmeno + + def osoba_prijmeni(self, obj): + return obj.osoba.prijmeni + + def osoba_mesto(self, obj): + return obj.osoba.mesto + def has_add_permission(self, req): return False