diff --git a/aleksis/core/migrations/0001_initial.py b/aleksis/core/migrations/0001_initial.py index 4dd6486f478a00e23a42876d302bbbe954648084..9999e1a6615138251c1745d4e33b3d9d404d0c7b 100644 --- a/aleksis/core/migrations/0001_initial.py +++ b/aleksis/core/migrations/0001_initial.py @@ -8,7 +8,6 @@ import django.contrib.postgres.fields.jsonb import django.contrib.sites.managers from django.db import migrations, models import django.db.models.deletion -import image_cropping.fields import phonenumber_field.modelfields @@ -125,8 +124,8 @@ class Migration(migrations.Migration): ('email', models.EmailField(blank=True, max_length=254, verbose_name='E-mail address')), ('date_of_birth', models.DateField(blank=True, null=True, verbose_name='Date of birth')), ('sex', models.CharField(blank=True, choices=[('f', 'female'), ('m', 'male')], max_length=1, verbose_name='Sex')), - ('photo', image_cropping.fields.ImageCropField(blank=True, null=True, upload_to='', verbose_name='Photo')), - ('photo_cropping', image_cropping.fields.ImageRatioField('photo', '600x800', adapt_rotation=False, allow_fullsize=False, free_crop=False, help_text=None, hide_image_field=False, size_warning=True, verbose_name='photo cropping')), + ('photo', models.CharField(blank=True, max_length=1)), + ('photo_cropping', models.CharField(blank=True, max_length=1)), ('description', models.TextField(blank=True, verbose_name='Description')), ('guardians', models.ManyToManyField(blank=True, related_name='children', to='core.Person', verbose_name='Guardians / Parents')), ('primary_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.Group', verbose_name='Primary group')), diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index 45571b0db5e19ee996162b5549b4aaad4652bf44..5a1cdbcb23778f2f0e1789f29eac4758545af893 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -4,7 +4,6 @@ from glob import glob from django.utils.translation import gettext_lazy as _ from dynaconf import LazySettings -from easy_thumbnails.conf import settings as thumbnail_settings from .util.core_helpers import ( get_app_packages, @@ -68,7 +67,6 @@ INSTALLED_APPS = [ "django_any_js", "django_yarnpkg", "django_tables2", - "easy_thumbnails", "maintenance_mode", "menu_generator", "reversion", @@ -158,8 +156,6 @@ TEMPLATES = [ }, ] -THUMBNAIL_PROCESSORS = () + thumbnail_settings.THUMBNAIL_PROCESSORS - WSGI_APPLICATION = "aleksis.core.wsgi.application" # Database diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py index 6b5c01c6f7cb5dc1aa5511aa249c765dce2744e6..060a0ef7aee06c51efe8ef2034e32b576e37fec6 100644 --- a/aleksis/core/util/core_helpers.py +++ b/aleksis/core/util/core_helpers.py @@ -64,7 +64,7 @@ def dt_show_toolbar(request: HttpRequest) -> bool: def get_app_packages() -> Sequence[str]: """Find all registered apps from the setuptools entrypoint.""" - return [f"{ep.module}.{ep.attr}" for ep in metadata.entry_points()["aleksis.app"]] + return [f"{ep.module}.{ep.attr}" for ep in metadata.entry_points().get("aleksis.app", [])] def merge_app_settings(