Merge branch 'master' of ssh://lux:/home/lxf/git/luxagraf

1 files changed, 2 insertions, 2 deletions

diff --git a/app/photos/models.py b/app/photos/models.py
index f0d7ec3..0d123c3 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -23,7 +23,7 @@ from django.db.models.signals import m2m_changed
 
 
 def get_upload_path(self, filename):
-    return "images/original/%s/%s" % ('2015', filename)#datetime.datetime.today().strftime("%Y"), filename)
+    return "images/original/%s/%s" % (datetime.datetime.today().strftime("%Y"), filename)
 
 def get_vid_upload_path(self, filename):
     return "images/videos/%s/%s" % (datetime.datetime.today().strftime("%Y"), filename)
@@ -180,7 +180,7 @@ def post_save_events(sender, update_fields, created, instance, **kwargs):
 
 @receiver(m2m_changed, sender=LuxImage.sizes.through)
 def update_photo_sizes(sender, instance, **kwargs):
-    base_path = "%s/%s/" % (settings.IMAGES_ROOT, '2015')# instance.pub_date.strftime("%Y"))
+    base_path = "%s/%s/" % (settings.IMAGES_ROOT, instance.pub_date.strftime("%Y"))
     filename, file_extension = os.path.splitext(instance.image.path)
     if file_extension != ".mp4":
         img = Image.open(instance.image.path)