diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2024-03-14 19:53:01 +0000 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2024-03-14 19:53:01 +0000 |
| commit | b3490aa52d0a7f36bb2675ee8fb5825550684e97 (patch) | |
| tree | 7b3516688612d9546a58079f1b581a125a855003 /core/views/uploads.py | |
| parent | 7325d934f985407ad121e967600f0d5aed08e8b3 (diff) | |
| download | troggle-b3490aa52d0a7f36bb2675ee8fb5825550684e97.tar.gz troggle-b3490aa52d0a7f36bb2675ee8fb5825550684e97.tar.bz2 troggle-b3490aa52d0a7f36bb2675ee8fb5825550684e97.zip | |
current year auto
Diffstat (limited to 'core/views/uploads.py')
| -rw-r--r-- | core/views/uploads.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py index dd5d25d..7265fff 100644 --- a/core/views/uploads.py +++ b/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 = [] |