{% trans "Your current profile picture:" %}
+ +
Gravatar set (normal)
Gravatar not set (normal)
Gravatar set (square)
Gravatar not set (square)
Gravatar set (small)
Gravatar not set (small)
Avatar normal
Avatar square
Avatar small
+ 
+ 
-# or
-# 
-# just make sure to update the "default" image path below
-
-import hashlib
-from urllib.parse import urlencode
-
-from django import template
-
-register = template.Library()
-
-
-class GravatarUrlNode(template.Node):
- def __init__(self, email, size=50):
- self.email = template.Variable(email)
- self.size = size
-
- def render(self, context):
- try:
- email = self.email.resolve(context)
- except template.VariableDoesNotExist:
- return ''
-
- default = "mm"
- size = int(self.size) * 2 # requested at retina size by default and scaled down at point of use with css
-
- gravatar_url = "//www.gravatar.com/avatar/{hash}?{params}".format(
- hash=hashlib.md5(email.lower().encode('utf-8')).hexdigest(),
- params=urlencode({'s': size, 'd': default})
- )
-
- return gravatar_url
-
-
-@register.tag
-def gravatar_url(parser, token):
- bits = token.split_contents()
-
- return GravatarUrlNode(*bits[1:])
diff --git a/wagtail/admin/tests/test_account_management.py b/wagtail/admin/tests/test_account_management.py
index b83672c806..1359c6d4b8 100644
--- a/wagtail/admin/tests/test_account_management.py
+++ b/wagtail/admin/tests/test_account_management.py
@@ -1,3 +1,6 @@
+import os
+import tempfile
+
import pytz
from django.contrib.auth import views as auth_views
@@ -13,6 +16,8 @@ from wagtail.admin.utils import (
from wagtail.tests.utils import WagtailTestUtils
from wagtail.users.models import UserProfile
+TMP_MEDIA_ROOT = tempfile.mktemp()
+
class TestAuthentication(TestCase, WagtailTestUtils):
"""
@@ -468,6 +473,101 @@ class TestAccountSection(TestCase, WagtailTestUtils):
self.assertNotContains(response, 'Set Time Zone')
+class TestAvatarSection(TestCase, WagtailTestUtils):
+ def _create_image(self):
+ from PIL import Image
+
+ with tempfile.NamedTemporaryFile(suffix='.jpg', delete=False) as f:
+ image = Image.new('RGB', (200, 200), 'white')
+ image.save(f, 'JPEG')
+
+ return open(f.name, mode='rb')
+
+ def setUp(self):
+ self.user = self.login()
+ self.avatar = self._create_image()
+ self.other_avatar = self._create_image()
+
+ def tearDown(self):
+ self.avatar.close()
+ self.other_avatar.close()
+
+ def test_avatar_preferences_view(self):
+ """
+ This tests that the change user profile(avatar) view responds with an index page
+ """
+ response = self.client.get(reverse('wagtailadmin_account_change_avatar'))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/change_avatar.html')
+ self.assertContains(response, "Change profile picture")
+
+ def test_avatar_preferences_post(self):
+ """
+ This tests that the change user profile(avatar) view change the user preferences
+ """
+ post_data = {
+ 'avatar_choice': 'default',
+ }
+ response = self.client.post(reverse('wagtailadmin_account_change_avatar'), post_data, follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ profile = UserProfile.get_for_user(get_user_model().objects.get(pk=self.user.pk))
+ self.assertEqual('default', profile.avatar_choice)
+
+ def test_get_avatar_returns_default_if_not_changed(self):
+ profile = UserProfile.get_for_user(get_user_model().objects.get(pk=self.user.pk))
+
+ self.assertEqual(profile.avatar_choice, 'default')
+ self.assertIn('default-user-avatar', profile.get_avatar_url())
+
+ def test_set_gravatar_returns_gravatar(self):
+ post_data = {
+ 'avatar_choice': 'gravatar',
+ }
+ response = self.client.post(reverse('wagtailadmin_account_change_avatar'), post_data, follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ profile = UserProfile.get_for_user(get_user_model().objects.get(pk=self.user.pk))
+ self.assertEqual(profile.avatar_choice, 'gravatar')
+ self.assertIn('www.gravatar.com', profile.get_avatar_url())
+
+ @override_settings(MEDIA_ROOT=TMP_MEDIA_ROOT)
+ def test_set_custom_avatar_stores_and_get_custom_avatar(self):
+ response = self.client.post(reverse('wagtailadmin_account_change_avatar'),
+ {'avatar_choice': 'custom',
+ 'avatar': self.avatar},
+ follow=True)
+
+ self.assertEqual(response.status_code, 200)
+
+ profile = UserProfile.get_for_user(get_user_model().objects.get(pk=self.user.pk))
+ self.assertEqual('custom', profile.avatar_choice)
+ self.assertIn(os.path.basename(self.avatar.name), profile.get_avatar_url())
+
+ @override_settings(MEDIA_ROOT=TMP_MEDIA_ROOT)
+ def test_user_upload_another_image_removes_previous_one(self):
+ response = self.client.post(reverse('wagtailadmin_account_change_avatar'),
+ {'avatar_choice': 'custom',
+ 'avatar': self.avatar},
+ follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ profile = UserProfile.get_for_user(get_user_model().objects.get(pk=self.user.pk))
+ old_avatar_path = profile.avatar.path
+
+ # Upload a new avatar
+ new_response = self.client.post(reverse('wagtailadmin_account_change_avatar'),
+ {'avatar_choice': 'custom',
+ 'avatar': self.other_avatar},
+ follow=True)
+ self.assertEqual(new_response.status_code, 200)
+
+ # Check old avatar doesn't exist anymore in filesystem
+ with self.assertRaises(FileNotFoundError):
+ open(old_avatar_path)
+
+
class TestAccountManagementForNonModerator(TestCase, WagtailTestUtils):
"""
Tests of reduced-functionality for editors
diff --git a/wagtail/admin/urls/__init__.py b/wagtail/admin/urls/__init__.py
index e0325fce3c..7ce810ec64 100644
--- a/wagtail/admin/urls/__init__.py
+++ b/wagtail/admin/urls/__init__.py
@@ -50,6 +50,7 @@ urlpatterns = [
account.notification_preferences,
name='wagtailadmin_account_notification_preferences'
),
+ url(r'account/change_avatar/$', account.change_avatar, name='wagtailadmin_account_change_avatar'),
url(
r'^account/language_preferences/$',
account.language_preferences,
diff --git a/wagtail/admin/views/account.py b/wagtail/admin/views/account.py
index 0a271d11b4..34fa86ace9 100644
--- a/wagtail/admin/views/account.py
+++ b/wagtail/admin/views/account.py
@@ -12,7 +12,7 @@ from django.utils.translation import activate
from wagtail.admin import forms
from wagtail.core import hooks
from wagtail.users.forms import (
- CurrentTimeZoneForm, EmailForm, NotificationPreferencesForm, PreferredLanguageForm)
+ AvatarPreferencesForm, CurrentTimeZoneForm, EmailForm, NotificationPreferencesForm, PreferredLanguageForm)
from wagtail.users.models import UserProfile
from wagtail.utils.loading import get_custom_form
@@ -185,6 +185,20 @@ def current_time_zone(request):
})
+def change_avatar(request):
+ if request.method == 'POST':
+ user_profile = UserProfile.get_for_user(request.user)
+ form = AvatarPreferencesForm(request.POST, request.FILES, instance=user_profile)
+ if form.is_valid():
+ form.save()
+ messages.success(request, _("Your preferences have been updated successfully!"))
+ return redirect('wagtailadmin_account_change_avatar')
+ else:
+ form = AvatarPreferencesForm(instance=UserProfile.get_for_user(request.user))
+
+ return render(request, 'wagtailadmin/account/change_avatar.html', {'form': form})
+
+
class LoginView(auth_views.LoginView):
template_name = 'wagtailadmin/login.html'
diff --git a/wagtail/admin/wagtail_hooks.py b/wagtail/admin/wagtail_hooks.py
index c709902b92..e2fc1ccc3e 100644
--- a/wagtail/admin/wagtail_hooks.py
+++ b/wagtail/admin/wagtail_hooks.py
@@ -194,15 +194,11 @@ def register_viewsets_urls():
@hooks.register('register_account_menu_item')
-def register_account_set_gravatar(request):
+def register_account_set_profile_picture(request):
return {
- 'url': 'https://gravatar.com/emails/',
- 'label': _('Set gravatar'),
- 'help_text': _(
- "Your avatar image is provided by Gravatar and is connected to "
- "your email address. With a Gravatar account you can set an "
- "avatar for any number of other email addresses you use."
- )
+ 'url': reverse('wagtailadmin_account_change_avatar'),
+ 'label': _('Set profile picture'),
+ 'help_text': _("Change your profile picture")
}
diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
index 01b331e433..0a111479d1 100644
--- a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
@@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags i18n staticfiles gravatar %}
+{% load wagtailadmin_tags i18n staticfiles avatar %}
{% block extra_css %}
{{ block.super }}
@@ -582,12 +582,9 @@
