current year auto

core/views/uploads.py

@@ -1,5 +1,5 @@
 import subprocess
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 
 from django import forms
@@ -166,7 +166,7 @@ def logbookedit(request, year=None, slug=None):
         try:
             expo = Expedition.objects.get(year=year)
         except:
-            year = current_expo()
+            year = current_expo() # creates new Expedition object if needed
         return year
         
     def new_entry_form():
@@ -608,7 +608,8 @@ def photoupload(request, folder=None):
     
     Pending generic file renaming capability more generally.
     """
-    year = settings.PHOTOS_YEAR
+    year = current_expo()
+    # year = settings.PHOTOS_YEAR
     filesaved = False
     actual_saved = []