Merge lp:~mhall119/summit/meeting-reverse-lookup-fix into lp:summit

[Michael Hall]

Fixes reverse lookup errors on meetings with no name and past summits page

Fixes reverse lookup errors on meetings with no name and past summits page

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-01-25 13:47:02 +0000
+++ summit/schedule/templates/schedule/meeting.html	2012-01-27 14:41:30 +0000
@@ -13,7 +13,7 @@
 {% if meeting.description %}
 <meta property="og:description" content="{{ meeting.description|linebreaks|striptags }}" />
 {% endif %}
-<meta property="og:url" content="http://summit.ubuntu.com{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name %}" />
+<meta property="og:url" content="http://summit.ubuntu.com{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}" />
 <meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png" />
 <meta property="og:site_name" content="The Summit Scheduler" />
 <meta property="og:type" content="article" />
@@ -24,21 +24,21 @@
 {% block sub_nav_links %}
     {% if meeting.private %}
     {% if meeting.private_key and meeting.private_key != '' %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.private_meeting meeting.summit.name, meeting.private_key, meeting.name %}">Shared URL</a>
+    <a class="sub-nav-item" href="{% url summit.schedule.views.private_meeting meeting.summit.name, meeting.private_key, meeting.name|default:'-' %}">Shared URL</a>
     {% else %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name %}+share">Share Meeting</a>
+    <a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}+share">Share Meeting</a>
     {% endif %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.edit_private summit.name, meeting.id, meeting.name %}">Edit Meeting</a>
+    <a class="sub-nav-item" href="{% url summit.schedule.views.edit_private summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a>
     {% endif %}
     {% if user_is_attending %}
         {% if user_is_participating %}
-        <a class="sub-nav-item" href="{% url summit.schedule.views.unregister meeting.summit.name, meeting.id, meeting.name %}">Skip this meeting</a>
+        <a class="sub-nav-item" href="{% url summit.schedule.views.unregister meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Skip this meeting</a>
         {% endif %}
     {% else %}
         {% if meeting.spec_url %}
             <a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to Blueprint</a>
         {% endif %}
-        <a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name %}">Attend this meeting</a>
+        <a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a>
     {% endif %}
 {% endblock %}
 

=== modified file 'summit/schedule/templates/schedule/past_summit.html'
--- summit/schedule/templates/schedule/past_summit.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/past_summit.html	2012-01-27 14:41:30 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}Previous Summits{%endblock %}
 
 {% block sub_nav_links %}
-    <a class="sub-nav-item" href="{% url summit.common.views.summit next_summit.name %}">Current Summit</a>
+    <a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current Summit</a>
 {% endblock %}
 
 {% block content %}