Merge remote-tracking branch 'origin/fix/login_concent_help_text_render' into test

Author: frjo

hypha/apply/users/admin_views.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import Group
 from django.db.models import CharField, Q, Value
 from django.db.models.functions import Coalesce, Lower, NullIf
-from django.template.defaultfilters import mark_safe
+from django.utils.safestring import mark_safe
 from rolepermissions import roles
 from wagtail.admin.filters import WagtailFilterSet
 from wagtail.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME

hypha/apply/users/forms.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import AuthenticationForm
-from django.template.defaultfilters import mark_safe
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from rolepermissions import roles
 from wagtail.users.forms import UserCreationForm, UserEditForm
@@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
         if self.user_settings.consent_show:
             self.fields["consent"] = forms.BooleanField(
                 label=self.user_settings.consent_text,
-                help_text=self.user_settings.consent_help,
+                help_text=mark_safe(self.user_settings.consent_help),
                 required=True,
             )
 
@@ -76,7 +76,7 @@ def __init__(self, *args, **kwargs):
         if self.user_settings.consent_show:
             self.fields["consent"] = forms.BooleanField(
                 label=self.user_settings.consent_text,
-                help_text=self.user_settings.consent_help,
+                help_text=mark_safe(self.user_settings.consent_help),
                 required=True,
             )
 
@@ -159,7 +159,7 @@ def __init__(self, register_view=False, request=None, *args, **kwargs):
         if register_view and self.user_settings.consent_show:
             self.fields["consent"] = forms.BooleanField(
                 label=self.user_settings.consent_text,
-                help_text=self.user_settings.consent_help,
+                help_text=mark_safe(self.user_settings.consent_help),
                 required=True,
             )
 

hypha/apply/users/templates/users/login.html

@@ -56,7 +56,7 @@ <h2 class="text-2xl">{% blocktrans %}Log in to {{ ORG_SHORT_NAME }}{% endblocktr
 
                         {% if settings.users.AuthSettings.extra_text %}
                             <div class="p-4 mb-6 rounded-xs prose prose-sm bg-slate-50">
-                                {{ settings.users.AuthSettings.extra_text|richtext}}
+                                {{ settings.users.AuthSettings.extra_text|richtext }}
                             </div>
                         {% endif %}
 

hypha/apply/users/templates/users/passwordless_login_signup.html

@@ -39,7 +39,7 @@ <h2 class="text-2xl">
 
                 {% if settings.users.AuthSettings.extra_text %}
                     <div class="p-4 mb-6 rounded-xs prose prose-sm bg-slate-50">
-                        {{ settings.users.AuthSettings.extra_text|richtext}}
+                        {{ settings.users.AuthSettings.extra_text|richtext }}
                     </div>
                 {% endif %}