Re-allow speaker proflie without specifying conference

This got lost somewhere along the way, so add it back.

diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py
index 8f5fcbf61e7546ea8213e9bac82a7b5f0cd360b5..3065d60add4740b18f0ab4e8da0165e7c6b137ec 100644 (file)
--- 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 8df88a3023bbd356905b9c1c0d46fb67e04c1370..3de4a75b0c9a83da7816d61329ea9d65ed1603a6 100644 (file)
--- a/postgresqleu/urls.py
+++ b/postgresqleu/urls.py
@@ -81,6 +81,7 @@ urlpatterns = [
        url(r'^events/(?P<urlname>[^/]+)/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),