remove more broken bits

liqd · Oct 22, 2024 · 2ab3588 · 2ab3588
1 parent 34416a7
commit 2ab3588
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 105 deletions.
diff --git a/euth/users/templates/euth_users/indicator_menu.html b/euth/users/templates/euth_users/indicator_menu.html
@@ -1,4 +1,4 @@
-{% load i18n thumbnail avatar %}
+{% load i18n avatar %}
 
 <ul class="nav navbar-nav navbar-right ms-sm-auto user-indicator order-sm-2" id="user-indicator">
     {% if request.user.is_authenticated %}

diff --git a/euth/users/templatetags/avatar.py b/euth/users/templatetags/avatar.py
@@ -1,12 +1,8 @@
 from django import template
-from easy_thumbnails.templatetags.thumbnail import thumbnail_url
 
 register = template.Library()
 
 
 @register.simple_tag()
 def get_avatar(user, size_alias):
-    if user.avatar:
-        return thumbnail_url(user.avatar, size_alias)
-    else:
-        return user.avatar_fallback
+    return user.avatar_fallback
diff --git a/euth_wagtail/settings/base.py b/euth_wagtail/settings/base.py
@@ -45,7 +45,6 @@
     'modelcluster',
     'taggit',
     'widget_tweaks',
-    'easy_thumbnails',
     'parler',
 
     'django.contrib.sites',
@@ -71,7 +70,6 @@
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django_cloudflare_push.middleware.push_middleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -130,7 +128,6 @@
 AUTH_USER_MODEL = 'euth_users.User'
 
 AUTHENTICATION_BACKENDS = (
-    'rules.permissions.ObjectPermissionBackend',
     'django.contrib.auth.backends.ModelBackend',
     'allauth.account.auth_backends.AuthenticationBackend',
 )

diff --git a/euth_wagtail/templates/a4dashboard/includes/project_list_item.html b/euth_wagtail/templates/a4dashboard/includes/project_list_item.html
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,4 +1,5 @@
 # Additional requirements
+bleach==6.1.0
 bcrypt==4.0.1
 brotli==1.0.9
 django-sites==0.11

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -1,18 +1,6 @@
-import os
 from urllib.parse import urlparse
 
-from django.conf import settings
 from django.urls import resolve
-from easy_thumbnails.files import get_thumbnailer
-
-
-def createThumbnail(imagefield):
-    thumbnailer = get_thumbnailer(imagefield)
-    thumbnail = thumbnailer.generate_thumbnail(
-        {'size': (800, 400), 'crop': 'smart'})
-    thumbnailer.save_thumbnail(thumbnail)
-    thumbnail_path = os.path.join(settings.MEDIA_ROOT, thumbnail.path)
-    return thumbnail_path
 
 
 def templates_used(response):