Update to work with newer django and python3

[sommitrealweird.git] / sommitrealweird / photo / models.py

diff --git a/sommitrealweird/photo/models.py b/sommitrealweird/photo/models.py
index 1e2cc6842da83f4c41f3311d7f761dc1f0257209..7bf1137394662cccac2a75200ee8528b330c7123 100644 (file)
--- a/sommitrealweird/photo/models.py
+++ b/sommitrealweird/photo/models.py
@@ -7,12 +7,18 @@ class Album(models.Model):
     slug = models.SlugField()
 
     def get_main_image(self):
-        main_photo = Photo.objects.filter(album=self).order_by('order','image')[0]
-        return main_photo.image
+        try:
+            main_photo = Photo.objects.filter(album=self).order_by('order','image')[0]
+            return main_photo.image
+        except:
+            return None
 
     def __unicode__(self):
         return "%s" %(self.name,)
 
+    def __str__(self):
+        return "%s" %(self.name,)
+
 def get_upload_path(photo, filename):
     if photo.album:
         return "photos/%s/%s" %(photo.album.slug, filename)
@@ -23,7 +29,10 @@ class Photo(models.Model):
     image = models.ImageField(upload_to=get_upload_path, null=True)
     caption = models.TextField(blank=True, null=True)
     order = models.IntegerField(blank=True, null=True)
-    album = models.ForeignKey('Album')
+    album = models.ForeignKey('Album', on_delete=models.CASCADE)
 
     def __unicode__(self):
         return "%s" %(self.image)
+
+    def __str__(self):
+        return "%s" %(self.image)