Part one of getting troggle to work with django 1.10

Major rework of how survex is processed

1 files changed, 6 insertions, 2 deletions

diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index 1bc709c..ef920d2 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -70,13 +70,17 @@ def expedition(request, expeditionname):
             pcell = { "persontrips": PersonTrip.objects.filter(personexpedition=personexpedition, 
                                                                 logbook_entry__date=date) }
             pcell["survexblocks"] = set(SurvexBlock.objects.filter(survexpersonrole__personexpedition=personexpedition, 
-                                                                    date = date))
+                                                                    date=date))
             prow.append(pcell)
         personexpeditiondays.append({"personexpedition":personexpedition, "personrow":prow})
         
     if "reload" in request.GET:
         LoadLogbookForExpedition(this_expedition)
-    return render(request,'expedition.html', {'expedition': this_expedition, 'expeditions':expeditions, 'personexpeditiondays':personexpeditiondays, 'settings':settings, 'dateditems': dateditems })
+    return render(request,'expedition.html', {'this_expedition': this_expedition,
+                                              'expeditions':expeditions,
+                                              'personexpeditiondays':personexpeditiondays,
+                                              'settings':settings,
+                                              'dateditems': dateditems })
 
 def get_absolute_url(self):
     return ('expedition', (expedition.year))