Part one of getting troggle to work with django 1.10

Major rework of how survex is processed

1 files changed, 5 insertions, 5 deletions

diff --git a/templates/expedition.html b/templates/expedition.html
index b5b58a8..8feeac6 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -2,15 +2,15 @@
 {% load wiki_markup %}
 {% load link %}
 
-{% block title %}Expedition {{expedition.name}}{% endblock %}
-{% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
+{% block title %}Expedition {{this_expedition.name}}{% endblock %}
+{% block editLink %}<a href={{this_expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
 
 {% block related %}
 {% endblock %}
 
 {% block content %}
 
-<h2>{{expedition.name}}</h2>
+<h2>{{this_expedition.name}}</h2>
 
 <p><b>Other years:</b>
 {% for otherexpedition in expeditions %}
@@ -29,7 +29,7 @@ an "S" for a survey trip.  The colours are the same for people on the same trip.
 <table class="expeditionpersonlist">
 <tr>
 <th>Caver</th>
-{% for expeditionday in expedition.expeditionday_set.all %} 
+{% for expeditionday in this_expedition.expeditionday_set.all %}
 <th>
   {{expeditionday.date.day}}
 </th>
@@ -63,7 +63,7 @@ an "S" for a survey trip.  The colours are the same for people on the same trip.
 <form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
 
 <h3>Logbooks and survey trips per day</h3>
-<a href="{% url "newLogBookEntry" expeditionyear=expedition.year %}">New logbook entry</a>
+<a href="{% url "newLogBookEntry" expeditionyear=this_expedition.year %}">New logbook entry</a>
 <table class="expeditionlogbooks">
 <tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
 {% regroup dateditems|dictsort:"date" by date as dates %}