tidying

core/models/caves.py

@@ -651,6 +651,7 @@ def GetCaveLookup():
         # 1626 aliases
         ("langgustl", "1626-354"),          
         ("2018-dm-07", "1626-359"),  
+        ("1626-2018-dm-07", "1626-359"),  
         ("homecoming", "2018-dm-07"),
         ("heimkommen", "2018-dm-07"),
         ("Heimkehr", "2018-dm-07"),

core/views/caves.py

@@ -125,17 +125,19 @@ def getnotablecaves():
 
 
 def caveindex(request):
-    #allcaves = Cave.objects.all()
-    allcaves = Cave.objects.filter(areacode="1626") # testing with subset
-    for c in allcaves:
-        if c.entrances:
-            pass
+    """Should use Django order-by for lazy sorting, not here. But only after we have a proper slug system in place for Caves
+    """
+    # allcaves = Cave.objects.all()
+    # for c in allcaves:
+        # if c.entrances:
+            # pass
     
     caves1623 = list(Cave.objects.filter(areacode="1623"))
     caves1624 = list(Cave.objects.filter(areacode="1624"))
     caves1626 = list(Cave.objects.filter(areacode="1626"))
     caves1627 = list(Cave.objects.filter(areacode="1627"))
     caves1623.sort(key=caveKey)
+    caves1624.sort(key=caveKey)
     caves1626.sort(key=caveKey)
     caves1627.sort(key=caveKey)
     return render(