diff --git a/anatomy/migrations/0029_auto_20210209_2239.py b/anatomy/migrations/0029_auto_20210209_2239.py new file mode 100644 index 00000000..60fc1770 --- /dev/null +++ b/anatomy/migrations/0029_auto_20210209_2239.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-02-09 22:39 + +import anatomy.models +import django.core.files.storage +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0028_auto_20210206_0905'), + ] + + operations = [ + migrations.AlterField( + model_name='anatomyquestion', + name='image', + field=models.ImageField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/anatomy/', location='/home/ross/rad/media//anatomy/'), upload_to=anatomy.models.image_directory_path), + ), + ] diff --git a/longs/migrations/0014_auto_20210211_1827.py b/longs/migrations/0014_auto_20210211_1827.py new file mode 100644 index 00000000..414ef2f2 --- /dev/null +++ b/longs/migrations/0014_auto_20210211_1827.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-02-11 18:27 + +import django.core.files.storage +from django.db import migrations, models +import longs.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0013_auto_20210206_2147'), + ] + + operations = [ + migrations.AlterField( + model_name='longseriesimage', + name='image', + field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/longs/', location='/home/ross/rad/media/longs/'), upload_to=longs.models.image_directory_path), + ), + ] diff --git a/longs/models.py b/longs/models.py index 624acb23..40fd7934 100644 --- a/longs/models.py +++ b/longs/models.py @@ -34,7 +34,7 @@ from easy_thumbnails.exceptions import InvalidImageFormatError image_storage = FileSystemStorage( # Physical file location ROOT - location=u"{0}/longs/".format(settings.MEDIA_ROOT), + location=u"{0}longs/".format(settings.MEDIA_ROOT), # Url for file base_url=u"{0}longs/".format(settings.MEDIA_URL), ) @@ -144,12 +144,10 @@ class Long(models.Model): def test_image_validator(file): - if 100 == 200: - raise ValidationError("Error") - return True + pass class LongSeriesImage(models.Model): - image = models.ImageField(upload_to=image_directory_path, storage=image_storage, validators=[test_image_validator]) + image = models.FileField(upload_to=image_directory_path, storage=image_storage) position = models.IntegerField(default=0) series = models.ForeignKey( "LongSeries", related_name="images", on_delete=models.SET_NULL, null=True diff --git a/rapids/migrations/0013_auto_20210209_2239.py b/rapids/migrations/0013_auto_20210209_2239.py new file mode 100644 index 00000000..31981c9a --- /dev/null +++ b/rapids/migrations/0013_auto_20210209_2239.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-02-09 22:39 + +import django.core.files.storage +from django.db import migrations, models +import rapids.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0012_auto_20210206_0905'), + ] + + operations = [ + migrations.AlterField( + model_name='rapidimage', + name='image', + field=models.ImageField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/rapids/', location='/home/ross/rad/media//rapids/'), upload_to=rapids.models.image_directory_path), + ), + ]