Add model field and fix logic

aleksis/core/models.py

@@ -21,6 +21,7 @@ from django.utils.translation import gettext_lazy as _
 import jsonstore
 from cache_memoize import cache_memoize
 from dynamic_preferences.models import PerInstancePreferenceModel
+from image_cropping import ImageCropField, ImageRatioField
 from phonenumber_field.modelfields import PhoneNumberField
 from polymorphic.models import PolymorphicModel
 
@@ -155,7 +156,8 @@ class Person(ExtensibleModel):
     date_of_birth = models.DateField(verbose_name=_("Date of birth"), blank=True, null=True)
     sex = models.CharField(verbose_name=_("Sex"), max_length=1, choices=SEX_CHOICES, blank=True)
 
-    photo = models.ImageField(verbose_name=_("Photo"), blank=True, null=True)
+    photo = ImageCropField(verbose_name=_("Photo"), blank=True, null=True)
+    photo_cropping = ImageRatioField("photo", "600x800", size_warning=True)
 
     guardians = models.ManyToManyField(
         "self",

aleksis/core/settings.py

@@ -69,6 +69,7 @@ INSTALLED_APPS = [
     "django_any_js",
     "django_yarnpkg",
     "django_tables2",
+    "image_cropping",
     "easy_thumbnails",
     "maintenance_mode",
     "menu_generator",
@@ -156,7 +157,9 @@ TEMPLATES = [
     },
 ]
 
-THUMBNAIL_PROCESSORS = () + thumbnail_settings.THUMBNAIL_PROCESSORS
+THUMBNAIL_PROCESSORS = (
+    "image_cropping.thumbnail_processors.crop_corners",
+) + thumbnail_settings.THUMBNAIL_PROCESSORS
 
 WSGI_APPLICATION = "aleksis.core.wsgi.application"
 

aleksis/core/templates/core/person/edit_photo.html

@@ -5,7 +5,7 @@
 {% load i18n %}
 
 {% block extra_head %}
-  {{ photo_form.media }}
+  {{ edit_person_photo_form.media }}
 {% endblock %}
 
 {% block browser_title %}{% blocktrans %}Edit photo{% endblocktrans %}{% endblock %}
@@ -16,7 +16,7 @@
 
   <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
-    {{ photo_form }}
+    {{ edit_person_photo_form }}
     {% include "core/partials/save_button.html" %}
   </form>
 

aleksis/core/views.py

@@ -27,6 +27,7 @@ from .forms import (
     EditGroupForm,
     EditGroupTypeForm,
     EditPersonForm,
+    EditPersonPhotoForm,
     GroupPreferenceForm,
     PersonPreferenceForm,
     PersonsAccountsFormSet,
@@ -684,7 +685,7 @@ def edit_person_photo(request: HttpRequest, id_: Optional[int] = None) -> HttpRe
     """Edit view for a single person, defaulting to logged-in person."""
     context = {}
 
-    person = get_object_or_404(Person, id_)
+    person = get_object_or_404(Person, id=id_)
     context["person"] = person
 
     # Edit form for existing group