From 0c8bb752fba13f5d8c26d4664c5c788f40d0757e Mon Sep 17 00:00:00 2001
From: Felix Rindt <felix@rindt.me>
Date: Thu, 10 Aug 2023 11:49:19 +0200
Subject: [PATCH] use absolute filter

---
 ephios_testplugin/notification.py | 7 ++-----
 ephios_testplugin/views.py        | 8 +++++---
 pyproject.toml                    | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ephios_testplugin/notification.py b/ephios_testplugin/notification.py
index 9bdbeee..34d2ad6 100644
--- a/ephios_testplugin/notification.py
+++ b/ephios_testplugin/notification.py
@@ -1,10 +1,8 @@
-from urllib.parse import urljoin
-
-from django.conf import settings
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from ephios.core.models import Notification
 from ephios.core.services.notifications.types import AbstractNotificationHandler
+from ephios.core.templatetags.settings_extras import make_absolute
 
 
 class TestNotification(AbstractNotificationHandler):
@@ -32,8 +30,7 @@ def get_actions(cls, notification):
         return [
             (
                 _("Look at test notification"),
-                urljoin(
-                    settings.GET_SITE_URL(), reverse("testplugin:test_notifications")
+                make_absolute( reverse("testplugin:test_notifications")
                 ),
             )
         ]
diff --git a/ephios_testplugin/views.py b/ephios_testplugin/views.py
index 2979408..1d43a62 100644
--- a/ephios_testplugin/views.py
+++ b/ephios_testplugin/views.py
@@ -1,8 +1,8 @@
 import io
+import logging
 from email import generator as email_generator
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from urllib.parse import urljoin
 
 from django import forms
 from django.conf import settings
@@ -21,10 +21,12 @@
     installed_notification_types,
     notification_type_from_slug,
 )
+from ephios.core.templatetags.settings_extras import make_absolute
 from ephios.extra.mixins import StaffRequiredMixin
 
 from ephios_testplugin.notification import TestNotification
 
+logger = logging.getLogger(__name__)
 
 class TestIndexView(StaffRequiredMixin, TemplateView):
     template_name = "testplugin/test_index.html"
@@ -71,8 +73,7 @@ def rendered_email_context(self, notification_type):
             "token": default_token_generator.make_token(self.request.user),
             "event_id": Event.objects.first().id,
             "participation_id": LocalParticipation.objects.first().id,
-            "disposition_url": urljoin(
-                settings.GET_SITE_URL(),
+            "disposition_url": make_absolute(
                 reverse(
                     "core:shift_disposition",
                     kwargs={"pk": LocalParticipation.objects.first().shift.pk},
@@ -116,6 +117,7 @@ def rendered_email_context(self, notification_type):
                 plaintext=notification_type.as_plaintext(notification),
             )
         except Exception as e:
+            logger.exception("Error rendering email template")
             return {
                 "email": f"Error: {e}",
             }
diff --git a/pyproject.toml b/pyproject.toml
index f8e0788..c1406c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ephios-testplugin"
-version = "1.2.2"
+version = "1.2.3"
 description = "A plugin to test and develop ephios"
 authors = ["Felix Rindt <felix@ephios.de>"]
 license = "MIT"