Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Streamlined upload date logic

MadoctheHadoc49d60aef9208
diff --git a/wger/gallery/forms.py b/wger/gallery/forms.py
index 9403d1170..b0b515022 100644
--- a/wger/gallery/forms.py
+++ b/wger/gallery/forms.py
@@ -14,7 +14,7 @@ from wger.utils.widgets import Html5DateInput
# Python Imaging Library to extract data
from PIL import Image as PilImage
-from datetime import datetime
+from datetime import datetime, date
class ImageForm(ModelForm):
date = DateField(
@@ -34,11 +34,13 @@ class ImageForm(ModelForm):
def save(self, commit=True):
instance = super().save(commit=False)
- # Tries to extract date from EXIF metadata
- if 'image' in self.changed_data:
+ if self.cleaned_data.get('date'):
+ instance.date = self.cleaned_data['date']
+ elif 'image' in self.changed_data:
exif_date = self._get_exif_date(self.cleaned_data['image'])
- if exif_date:
- instance.date = exif_date
+ instance.date = exif_date if exif_date else date.today()
+ else:
+ instance.date = date.today()
if commit:
instance.save()
diff --git a/wger/gallery/models/image.py b/wger/gallery/models/image.py
index 3b23a329d..36e55a9f2 100644
--- a/wger/gallery/models/image.py
+++ b/wger/gallery/models/image.py
@@ -43,7 +43,6 @@ class Image(models.Model):
date = models.DateField(
verbose_name='Date',
- default=datetime.datetime.now,
)
user = models.ForeignKey(