From 830eea0a096ef3312cf4d02c39af70bff2683342 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 15 Feb 2021 12:04:22 +0000
Subject: [PATCH] .

---
 rapids/migrations/0019_auto_20210215_1203.py | 20 ++++++++++++++++++++
 rapids/models.py                             |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 rapids/migrations/0019_auto_20210215_1203.py

diff --git a/rapids/migrations/0019_auto_20210215_1203.py b/rapids/migrations/0019_auto_20210215_1203.py
new file mode 100644
index 00000000..13bec370
--- /dev/null
+++ b/rapids/migrations/0019_auto_20210215_1203.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.5 on 2021-02-15 12:03
+
+import django.core.files.storage
+from django.db import migrations, models
+import rapids.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rapids', '0018_auto_20210215_1144'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rapidimage',
+            name='image',
+            field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/', location='/home/django/rad/media/'), upload_to=rapids.models.image_directory_path),
+        ),
+    ]
diff --git a/rapids/models.py b/rapids/models.py
index 75754638..b844bb7c 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -24,14 +24,14 @@ from generic.models import Site, Condition, Sign, ExamBase
 
 image_storage = FileSystemStorage(
     # Physical file location ROOT
-    location=u"{0}rapids/".format(settings.MEDIA_ROOT),
+    location=u"{0}".format(settings.MEDIA_ROOT),
     # Url for file
-    base_url=u"{0}rapids/".format(settings.MEDIA_URL),
+    base_url=u"{0}".format(settings.MEDIA_URL),
 )
 
 def image_directory_path(instance, filename):
-    return u"{0}".format(filename)
-    return u"picture/{0}".format(filename)
+    #return u"{0}".format(filename)
+    return u"rapids/picture/{0}".format(filename)