From d43c7cce44605a22a02b73fbe93b1794001178a6 Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Wed, 13 Nov 2024 20:41:47 +0100 Subject: [PATCH] members/admin: only attach bill to sjr application if statement exists --- jdav_web/jdav_web/urls.py | 2 +- jdav_web/members/admin.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jdav_web/jdav_web/urls.py b/jdav_web/jdav_web/urls.py index d38e369..4c5f283 100644 --- a/jdav_web/jdav_web/urls.py +++ b/jdav_web/jdav_web/urls.py @@ -29,7 +29,7 @@ admin.site.site_header = 'Kompass' urlpatterns += i18n_patterns( re_path(r'^kompass/?', admin.site.urls), re_path(r'^jet/', include('jet.urls', 'jet')), # Django JET URLS - re_path(r'^admin/', RedirectView.as_view(url='/kompass')), + re_path(r'^admin/?', RedirectView.as_view(url='/kompass')), re_path(r'^newsletter/', include('mailer.urls', namespace="mailer")), re_path(r'^members/', include('members.urls', namespace="members")), re_path(r'^LBAlpin/Programm(/)?(20)?[0-9]{0,2}', include('ludwigsburgalpin.urls', diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 5712776..c4d3bac 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -739,7 +739,10 @@ class FreizeitAdmin(FilteredMemberFieldMixin, CommonAdminMixin, nested_admin.Nes if not self.may_view_excursion(request, memberlist): return self.not_allowed_view(request, memberlist) context = memberlist.sjr_application_fields() - attachments = [b.proof.path for b in memberlist.statement.bill_set.all()] + if hasattr(memberlist, 'statement'): + attachments = [b.proof.path for b in memberlist.statement.bill_set.all()] + else: + attachments = [] title = memberlist.ljpproposal.title if hasattr(memberlist, 'ljpproposal') else memberlist.name return fill_pdf_form(title + "_SJR_Antrag", 'members/sjr_template.pdf', context, attachments) sjr_application.short_description = _('Generate SJR application')