diff --git a/biscuit/core/forms.py b/biscuit/core/forms.py
index 644c78016af48d2273f5477cffa3ed7017d2eb7f..e71e2bad219a12879f6c8fe32a7adc1a9705d42a 100644
--- a/biscuit/core/forms.py
+++ b/biscuit/core/forms.py
@@ -40,7 +40,7 @@ PersonsAccountsFormSet = forms.modelformset_factory(
class EditPersonForm(forms.ModelForm):
class Meta:
model = Person
- fields = ['user', 'is_active', 'first_name', 'last_name', 'additional_name', 'short_name', 'street', 'housenumber', 'postal_code', 'place', 'phone_number', 'mobile_number', 'email', 'date_of_birth', 'sex', 'photo']
+ fields = ['user', 'is_active', 'first_name', 'last_name', 'additional_name', 'short_name', 'street', 'housenumber', 'postal_code', 'place', 'phone_number', 'mobile_number', 'email', 'date_of_birth', 'sex', 'photo', 'photo_cropping']
new_user = forms.CharField(
required=False,
diff --git a/biscuit/core/migrations/0015_person_photo_crop.py b/biscuit/core/migrations/0015_person_photo_crop.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a15d9b247ec64e9d10559d0e41c9b0f88e9d43d
--- /dev/null
+++ b/biscuit/core/migrations/0015_person_photo_crop.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.4 on 2019-08-29 12:12
+
+from django.db import migrations
+import image_cropping.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0014_remove_unique'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='person',
+ name='photo_cropping',
+ field=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'),
+ ),
+ migrations.AlterField(
+ model_name='person',
+ name='photo',
+ field=image_cropping.fields.ImageCropField(blank=True, null=True, upload_to='', verbose_name='Photo'),
+ ),
+ ]
diff --git a/biscuit/core/models.py b/biscuit/core/models.py
index a1991a538111f5c0a63c9ccb5164311ba9a11dc9..21e872794d1dd5059d3bedfdd1f2a75b56fb5b45 100644
--- a/biscuit/core/models.py
+++ b/biscuit/core/models.py
@@ -4,6 +4,7 @@ from django.contrib.auth import get_user_model
from django.db import models
from django.utils.translation import ugettext_lazy as _
+from image_cropping import ImageCropField, ImageRatioField
from phonenumber_field.modelfields import PhoneNumberField
from .mixins import SchoolRelated
@@ -68,7 +69,8 @@ class Person(SchoolRelated):
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)
import_ref = models.CharField(verbose_name=_(
'Reference ID of import source'), max_length=64, blank=True, null=True, editable=False)
diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py
index 2b9394d0aa050e160949ffe1876f4cedeca2c936..7bebe91d204a204b2657e636b774b5254091c11f 100644
--- a/biscuit/core/settings.py
+++ b/biscuit/core/settings.py
@@ -5,6 +5,7 @@ import sys
from django.utils.translation import ugettext_lazy as _
from dynaconf import LazySettings
+from easy_thumbnails.conf import Settings as thumbnail_settings
from .util.core_helpers import get_app_packages
@@ -54,6 +55,8 @@ INSTALLED_APPS = [
'fa',
'django_any_js',
'django_tables2',
+ 'easy_thumbnails',
+ 'image_cropping',
'maintenance_mode',
'menu_generator',
'phonenumber_field',
@@ -112,6 +115,13 @@ TEMPLATES = [
},
]
+THUMBNAIL_PROCESSORS = (
+ 'image_cropping.thumbnail_processors.crop_corners',
+) + thumbnail_settings.THUMBNAIL_PROCESSORS
+
+# Already included by base template / Bootstrap
+IMAGE_CROPPING_JQUERY_URL = None
+
WSGI_APPLICATION = 'biscuit.core.wsgi.application'
@@ -214,7 +224,8 @@ BOOTSTRAP4 = {
'jquery_url': _settings.get('bootstrap.jquery_url', '/javascript/jquery/jquery.min.js'),
'popper_url': _settings.get('bootstrap.popper_url', '/javascript/popper.js/umd/popper.min.js'),
'include_jquery': True,
- 'include_popper': True
+ 'include_popper': True,
+ 'javascript_in_head': True
}
DATATABLES_BASE = _settings.get(
diff --git a/biscuit/core/templates/core/edit_person.html b/biscuit/core/templates/core/edit_person.html
index 66058dca1d707e1756ea76c642983d5584a83edf..949026bdf17fc9a66823a21dac40969375fa8ecf 100644
--- a/biscuit/core/templates/core/edit_person.html
+++ b/biscuit/core/templates/core/edit_person.html
@@ -3,6 +3,11 @@
{% block page_title %}{% blocktrans %}Edit person{% endblocktrans %}{% endblock %}
+{% block bootstrap4_extra_head %}
+ {{ block.super }}
+ {{ edit_person_form.media }}
+{% endblock %}
+
{% block content %}
<form method="post" enctype="multipart/form-data">
diff --git a/biscuit/core/templates/core/person_card.html b/biscuit/core/templates/core/person_card.html
index 2ce2d7ec465ac2dfade4ee1476b69881efeb0327..7afad180da4027bc9763b60990dfbb413c742aa5 100644
--- a/biscuit/core/templates/core/person_card.html
+++ b/biscuit/core/templates/core/person_card.html
@@ -1,11 +1,11 @@
-{% load staticfiles %}
+{% load staticfiles cropping %}
<div class="card shadow">
<div class="card-header">{{ person.first_name }} {{ person.last_name }}</div>
<div class="card-body">
<div class="row no-gutters">
<div class="col-sm">
{% if person.photo %}
- <img class="person-img" src="{{ person.photo.url }}" alt="{{ person.first_name }} {{ person.last_name }}" />
+ <img class="person-img" src="{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% else %}
<img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% endif %}
diff --git a/biscuit/core/templates/core/person_full.html b/biscuit/core/templates/core/person_full.html
index 2c34c774faccefedd0bc1b635d887b78a55f83bc..144ae522bca2b3bb1d80c3302a38d3e2431dd12e 100644
--- a/biscuit/core/templates/core/person_full.html
+++ b/biscuit/core/templates/core/person_full.html
@@ -1,5 +1,5 @@
{% extends "core/base.html" %}
-{% load bootstrap4 font_awesome i18n staticfiles %}
+{% load bootstrap4 font_awesome i18n staticfiles cropping %}
{% load render_table from django_tables2 %}
{% block content %}
@@ -16,7 +16,7 @@
<tr>
<td rowspan="6">
{% if person.photo %}
- <img class="person-img" src="{{ person.photo.url }}" alt="{{ person.first_name }} {{ person.last_name }}" />
+ <img class="person-img" src="{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% else %}
<img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% endif %}
diff --git a/biscuit/core/views.py b/biscuit/core/views.py
index 1ffa448dc1f2e403d37fe7171ee57b6a47f79c1a..45942e1895e7cdd0a98673be2936503ce3012090 100644
--- a/biscuit/core/views.py
+++ b/biscuit/core/views.py
@@ -156,7 +156,7 @@ def edit_person(request: HttpRequest, id_: int) -> HttpResponse:
edit_person_form.save(commit=True)
messages.success(request, _('The person has been saved.'))
- return redirect('persons')
+ return redirect('edit_person_by_id', id_=person.id)
context['edit_person_form'] = edit_person_form
diff --git a/pyproject.toml b/pyproject.toml
index 210583aa687e2b50514f482d561175dd89bbf9ac..8768e6df184286dbfe003a6e957acf990818813e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,6 +40,8 @@ django-settings-context-processor = "^0.2"
django-auth-ldap = { version = "^2.0", optional = true }
django-maintenance-mode = "^0.13.3"
django-ipware = "^2.1"
+easy-thumbnails = "^2.6"
+django-image-cropping = "^1.2"
[tool.poetry.extras]
ldap = ["django-auth-ldap"]