From 16ca01d16fc640b375f65dea6b05dcea6418ff62 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Sat, 17 Nov 2018 22:53:15 +0100 Subject: [PATCH] Re-allow speaker proflie without specifying conference This got lost somewhere along the way, so add it back. --- postgresqleu/confreg/views.py | 13 +++++++------ postgresqleu/urls.py | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index 8f5fcbf..3065d60 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -69,10 +69,7 @@ import markdown # if the conference is configured for jinja templates. # def render_conference_response(request, conference, pagemagic, templatename, dictionary=None): - if not conference: - raise Exception("Conference has to be specified!") - - if conference.jinjadir: + if conference and conference.jinjadir: # If a jinjadir is defined, then *always* use jinja. return render_jinja_conference_response(request, conference, pagemagic, templatename, dictionary) @@ -1126,8 +1123,12 @@ def speakerphoto(request, speakerid): return HttpResponse(base64.b64decode(speakerphoto.photo), content_type='image/jpg') @login_required -def speakerprofile(request, confurlname): - conf = get_object_or_404(Conference, urlname=confurlname) +def speakerprofile(request, confurlname=None): + if confurlname: + conf = get_object_or_404(Conference, urlname=confurlname) + else: + conf = None + speaker = conferences = callforpapers = None try: speaker = get_object_or_404(Speaker, user=request.user) diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py index 8df88a3..3de4a75 100644 --- a/postgresqleu/urls.py +++ b/postgresqleu/urls.py @@ -81,6 +81,7 @@ urlpatterns = [ url(r'^events/(?P[^/]+)/volunteer/', include(postgresqleu.confreg.volsched)), url(r'^events/([^/]+)/sessions/$', postgresqleu.confreg.views.sessionlist), url(r'^events/speaker/(\d+)/photo/$', postgresqleu.confreg.views.speakerphoto), + url(r'^events/speakerprofile/$', postgresqleu.confreg.views.speakerprofile), url(r'^events/([^/]+)/speakerprofile/$', postgresqleu.confreg.views.speakerprofile), url(r'^events/([^/]+)/callforpapers/$', postgresqleu.confreg.views.callforpapers), url(r'^events/([^/]+)/callforpapers/(\d+|new)/$', postgresqleu.confreg.views.callforpapers_edit), -- 2.39.5