3 files changed, 43 insertions, 2 deletions
diff --git a/app/photos/migrations/0020_auto_20201201_2116.py b/app/photos/migrations/0020_auto_20201201_2116.py
new file mode 100644
index 0000000..39d4fd9
--- /dev/null
+++ b/app/photos/migrations/0020_auto_20201201_2116.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1 on 2020-12-01 21:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('locations', '0028_auto_20200308_1152'),
+        ('photos', '0019_auto_20190704_0903'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='luximage',
+            name='location',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='locations.location'),
+        ),
+    ]
diff --git a/app/photos/migrations/0021_auto_20201201_2118.py b/app/photos/migrations/0021_auto_20201201_2118.py
new file mode 100644
index 0000000..25e4f8f
--- /dev/null
+++ b/app/photos/migrations/0021_auto_20201201_2118.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1 on 2020-12-01 21:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photos', '0020_auto_20201201_2116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='luximage',
+            name='sizes',
+            field=models.ManyToManyField(blank=True, related_name='_luximage_sizes_+', to='photos.LuxImageSize'),
+        ),
+    ]
diff --git a/app/photos/models.py b/app/photos/models.py
index 6253336..24a218f 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -70,9 +70,9 @@ class LuxImage(models.Model):
     height = models.CharField(max_length=6, blank=True, null=True)
     width = models.CharField(max_length=6, blank=True, null=True)
     point = models.PointField(null=True, blank=True)
-    location = models.ForeignKey("locations.Location", on_delete=models.CASCADE, null=True, blank=True)
+    location = models.ForeignKey("locations.Location", on_delete=models.CASCADE, null=True, blank=True, related_name="+")
     is_public = models.BooleanField(default=True)
-    sizes = models.ManyToManyField(LuxImageSize, blank=True)
+    sizes = models.ManyToManyField(LuxImageSize, blank=True, related_name="+")
     flickr_id = models.CharField(null=True, blank=True, max_length=80)
     twitter_link = models.CharField(null=True, blank=True, max_length=300)
     facebook_link = models.CharField(null=True, blank=True, max_length=300)
@@ -110,6 +110,9 @@ class LuxImage(models.Model):
     def get_image_name(self):
         return self.image.url.split("original/")[1][5:-4]
 
+    def get_image_name_new(self):
+        return os.path.basename(self.image.path)[:-4]
+
     def get_image_ext(self):
         return self.image.url[-3:]