From 4a167acbbafbb0436e76057c7eb56ae81ea2b450 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Fri, 29 Dec 2017 16:42:41 +0100 Subject: [PATCH] Remove support for non-conference speakerprofile viewing This was the only case where conference was passed as None into the rendering system, so we can simplify the code a bit and downstream skinning (used by postgresql.us for example) by removing the ability. The speaker profile is still shared. It's just mandatory to specify which conference in the link, to get the proper skinning. --- postgresqleu/confreg/views.py | 14 ++++++-------- postgresqleu/urls.py | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index b8b615e..e6e285a 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -71,9 +71,10 @@ import json # if the conference is configured for jinja templates. # def render_conference_response(request, conference, pagemagic, templatename, dictionary=None): - # Conference can be None for pages that can be both inside and outside - # the framework, such as the speaker profile. - if conference and conference.jinjadir: + if not conference: + raise Exception("Conference has to be specified!") + + if conference.jinjadir: # If a jinjadir is defined, then *always* use jinja. return render_jinja_conference_response(request, conference, pagemagic, templatename, dictionary) @@ -744,7 +745,8 @@ def speakerphoto(request, speakerid): return HttpResponse(base64.b64decode(speakerphoto.photo), content_type='image/jpg') @login_required -def speakerprofile(request, confurlname=None): +def speakerprofile(request, confurlname): + conf = get_object_or_404(Conference, urlname=confurlname) speaker = conferences = callforpapers = None try: speaker = get_object_or_404(Speaker, user=request.user) @@ -774,10 +776,6 @@ def speakerprofile(request, confurlname=None): else: form = SpeakerProfileForm(instance=speaker) - if confurlname: - conf = get_object_or_404(Conference, urlname=confurlname) - else: - conf = None return render_conference_response(request, conf, 'cfp', 'confreg/speakerprofile.html', { 'speaker': speaker, 'conferences': conferences, diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py index 06e85e1..221d09d 100644 --- a/postgresqleu/urls.py +++ b/postgresqleu/urls.py @@ -74,7 +74,6 @@ urlpatterns = patterns('', (r'^events/reports/time/$', postgresqleu.confreg.reporting.timereport), (r'^events/([^/]+)/sessions/$', postgresqleu.confreg.views.sessionlist), (r'^events/speaker/(\d+)/photo/$', postgresqleu.confreg.views.speakerphoto), - (r'^events/speakerprofile/$', postgresqleu.confreg.views.speakerprofile), (r'^events/([^/]+)/speakerprofile/$', postgresqleu.confreg.views.speakerprofile), (r'^events/([^/]+)/callforpapers/$', postgresqleu.confreg.views.callforpapers), (r'^events/([^/]+)/callforpapers/(\d+|new)/$', postgresqleu.confreg.views.callforpapers_edit), -- 2.39.5