From 45d4b1e1c5449c30d252d2b224f46df93faec17b Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 15 Feb 2021 10:58:45 +0000 Subject: [PATCH] . --- anatomy/migrations/0031_auto_20210215_1043.py | 20 +++++++++++++++++++ longs/migrations/0017_auto_20210215_1043.py | 20 +++++++++++++++++++ longs/migrations/0018_auto_20210215_1052.py | 19 ++++++++++++++++++ longs/models.py | 4 +++- longs/templates/longs/longseries_form.html | 2 +- rad/settings.py | 1 - rapids/migrations/0017_auto_20210215_1043.py | 20 +++++++++++++++++++ 7 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 anatomy/migrations/0031_auto_20210215_1043.py create mode 100644 longs/migrations/0017_auto_20210215_1043.py create mode 100644 longs/migrations/0018_auto_20210215_1052.py create mode 100644 rapids/migrations/0017_auto_20210215_1043.py diff --git a/anatomy/migrations/0031_auto_20210215_1043.py b/anatomy/migrations/0031_auto_20210215_1043.py new file mode 100644 index 00000000..adae2402 --- /dev/null +++ b/anatomy/migrations/0031_auto_20210215_1043.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.5 on 2021-02-15 10:43 + +import anatomy.models +import django.core.files.storage +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0030_auto_20210214_2028'), + ] + + operations = [ + migrations.AlterField( + model_name='anatomyquestion', + name='image', + field=models.ImageField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/anatomy/', location='/home/ross/sites/rad/media//anatomy/'), upload_to=anatomy.models.image_directory_path), + ), + ] diff --git a/longs/migrations/0017_auto_20210215_1043.py b/longs/migrations/0017_auto_20210215_1043.py new file mode 100644 index 00000000..52080476 --- /dev/null +++ b/longs/migrations/0017_auto_20210215_1043.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.5 on 2021-02-15 10:43 + +import django.core.files.storage +from django.db import migrations, models +import longs.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0016_auto_20210214_2301'), + ] + + operations = [ + migrations.AlterField( + model_name='longseriesimage', + name='image', + field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/longs/', location='/home/ross/sites/rad/media/longs/'), upload_to=longs.models.image_directory_path), + ), + ] diff --git a/longs/migrations/0018_auto_20210215_1052.py b/longs/migrations/0018_auto_20210215_1052.py new file mode 100644 index 00000000..4753da2e --- /dev/null +++ b/longs/migrations/0018_auto_20210215_1052.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2021-02-15 10:52 + +from django.db import migrations, models +import longs.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0017_auto_20210215_1043'), + ] + + operations = [ + migrations.AlterField( + model_name='longseriesimage', + name='image', + field=models.FileField(upload_to=longs.models.image_directory_path), + ), + ] diff --git a/longs/models.py b/longs/models.py index b60143f1..16542aef 100644 --- a/longs/models.py +++ b/longs/models.py @@ -32,6 +32,8 @@ from generic.models import Examination, Condition, Sign, ExamBase from easy_thumbnails.files import get_thumbnailer from easy_thumbnails.exceptions import InvalidImageFormatError + + image_storage = FileSystemStorage( # Physical file location ROOT location=u"{0}longs/".format(settings.MEDIA_ROOT), @@ -147,7 +149,7 @@ def test_image_validator(file): pass class LongSeriesImage(models.Model): - image = models.FileField(upload_to=image_directory_path, storage=image_storage) + image = models.FileField(upload_to=image_directory_path) position = models.IntegerField(default=0) series = models.ForeignKey( "LongSeries", related_name="images", on_delete=models.SET_NULL, null=True diff --git a/longs/templates/longs/longseries_form.html b/longs/templates/longs/longseries_form.html index 7d1a23f3..99a11431 100755 --- a/longs/templates/longs/longseries_form.html +++ b/longs/templates/longs/longseries_form.html @@ -310,7 +310,7 @@ This form will create a image set that can be associated with a long question. I

Images:

-
Drop images here (or use the buttons below) +
Drop images here (or use the buttons below). Dropping images here will overwrite existing images in the series.
diff --git a/rad/settings.py b/rad/settings.py index 71979881..b7be7a07 100644 --- a/rad/settings.py +++ b/rad/settings.py @@ -39,7 +39,6 @@ INSTALLED_APPS = [ "django_tables2", "django_filters", "easy_thumbnails", - "easy_thumbnails", "filer", "mptt", "sortedm2m", diff --git a/rapids/migrations/0017_auto_20210215_1043.py b/rapids/migrations/0017_auto_20210215_1043.py new file mode 100644 index 00000000..a19ef210 --- /dev/null +++ b/rapids/migrations/0017_auto_20210215_1043.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.5 on 2021-02-15 10:43 + +import django.core.files.storage +from django.db import migrations, models +import rapids.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0016_auto_20210214_2028'), + ] + + operations = [ + migrations.AlterField( + model_name='rapidimage', + name='image', + field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/rapids/', location='/home/ross/sites/rad/media/rapids/'), upload_to=rapids.models.image_directory_path), + ), + ]