From 321d45b6289564ddba71047c1f08697132ec31af Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 1 Aug 2022 22:29:06 +0300 Subject: [PATCH] Fix unit tests --- infoscreen/templates/infoscreen_admin.html | 2 +- members/templates/application_delete_confirm.html | 2 +- members/templates/application_edit.html | 2 +- members/templates/application_form_base.html | 2 +- members/templates/application_list.html | 2 +- members/templates/base.html | 2 +- members/templates/member_add.html | 2 +- members/templates/member_add_many.html | 2 +- members/templates/member_add_many_confirm.html | 2 +- members/templates/member_delete_confirm.html | 2 +- members/templates/member_edit.html | 2 +- members/templates/member_list.html | 2 +- members/templates/payment_add.html | 2 +- members/templates/payment_delete_confirm.html | 2 +- members/templates/payment_edit.html | 2 +- members/templates/payment_list.html | 2 +- members/templates/settings.html | 2 +- members/templates/upload_form.html | 2 +- members/views/applications.py | 4 ++-- templates/error.html | 2 +- webapp/models.py | 2 +- webapp/templates/base.html | 6 +++--- webapp/templates/contact.html | 2 +- webapp/templates/event_calendar.html | 2 +- webapp/templates/freshmen.html | 2 +- webapp/templates/guild.html | 2 +- webapp/templates/index.html | 2 +- webapp/templates/international.html | 2 +- webapp/templates/jobs.html | 2 +- webapp/templates/sosso.html | 2 +- webapp/utils.py | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html index ceef9c4..4db11d0 100644 --- a/infoscreen/templates/infoscreen_admin.html +++ b/infoscreen/templates/infoscreen_admin.html @@ -40,5 +40,5 @@ -{% include "webapp:footer.html" %} +{% include "footer.html" %} {% endblock body %} \ No newline at end of file diff --git a/members/templates/application_delete_confirm.html b/members/templates/application_delete_confirm.html index 0da32d0..a6049fc 100644 --- a/members/templates/application_delete_confirm.html +++ b/members/templates/application_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/application_edit.html b/members/templates/application_edit.html index 5562af9..78143c2 100644 --- a/members/templates/application_edit.html +++ b/members/templates/application_edit.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/application_form_base.html b/members/templates/application_form_base.html index 51af6d6..18ca670 100644 --- a/members/templates/application_form_base.html +++ b/members/templates/application_form_base.html @@ -35,6 +35,6 @@ {% block content %} {% endblock content %} - {% include "webapp:footer.html" %} + {% include "footer.html" %} diff --git a/members/templates/application_list.html b/members/templates/application_list.html index 7b9b439..5a8f4e0 100644 --- a/members/templates/application_list.html +++ b/members/templates/application_list.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} diff --git a/members/templates/base.html b/members/templates/base.html index ef4b7ca..c991365 100644 --- a/members/templates/base.html +++ b/members/templates/base.html @@ -91,6 +91,6 @@ - {% include "webapp:footer.html" %} + {% include "footer.html" %} diff --git a/members/templates/member_add.html b/members/templates/member_add.html index 8f42188..7be9009 100644 --- a/members/templates/member_add.html +++ b/members/templates/member_add.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/members/templates/member_add_many.html b/members/templates/member_add_many.html index 77aa5df..d9a80bb 100644 --- a/members/templates/member_add_many.html +++ b/members/templates/member_add_many.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load static %} diff --git a/members/templates/member_add_many_confirm.html b/members/templates/member_add_many_confirm.html index abde658..35f6f12 100644 --- a/members/templates/member_add_many_confirm.html +++ b/members/templates/member_add_many_confirm.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} diff --git a/members/templates/member_delete_confirm.html b/members/templates/member_delete_confirm.html index a613750..8c251e9 100644 --- a/members/templates/member_delete_confirm.html +++ b/members/templates/member_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/member_edit.html b/members/templates/member_edit.html index cdec20c..11709f9 100644 --- a/members/templates/member_edit.html +++ b/members/templates/member_edit.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html index f293064..0ec5290 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/payment_add.html b/members/templates/payment_add.html index ae6a1d6..276f49f 100644 --- a/members/templates/payment_add.html +++ b/members/templates/payment_add.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/members/templates/payment_delete_confirm.html b/members/templates/payment_delete_confirm.html index 02b541e..1d9fc16 100644 --- a/members/templates/payment_delete_confirm.html +++ b/members/templates/payment_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/payment_edit.html b/members/templates/payment_edit.html index 5033a69..07dc6a6 100644 --- a/members/templates/payment_edit.html +++ b/members/templates/payment_edit.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/payment_list.html b/members/templates/payment_list.html index 0329cd7..765aae5 100644 --- a/members/templates/payment_list.html +++ b/members/templates/payment_list.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/settings.html b/members/templates/settings.html index 7767302..ed6ccc9 100644 --- a/members/templates/settings.html +++ b/members/templates/settings.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/upload_form.html b/members/templates/upload_form.html index 8163128..5cc328f 100644 --- a/members/templates/upload_form.html +++ b/members/templates/upload_form.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% block content %}

{{ title }}

diff --git a/members/views/applications.py b/members/views/applications.py index dc5f033..4376d50 100644 --- a/members/views/applications.py +++ b/members/views/applications.py @@ -101,7 +101,7 @@ def application_accept(request, *args, **kwargs): subject = _("Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!") message = render_to_string( - "members:email_application_accept.html", + "email_application_accept.html", {"first_name": application.first_name}, ) send_email(member.email, subject, message, True) @@ -186,7 +186,7 @@ def application_submit(request, *args, **kwargs): ) message = render_to_string( - "members:email_application_submit.html", + "email_application_submit.html", { "application": application, "ayy": _("Kyllä") if application.AYY else _("Ei"), diff --git a/templates/error.html b/templates/error.html index 3d09501..25c4b1b 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,4 +1,4 @@ -{% extends "members:base.html" %} +{% extends "base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/models.py b/webapp/models.py index fc8314f..4a01b07 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -279,7 +279,7 @@ class JobAd(models.Model): def generateMessage(heading: str, title: str, description: str, url: str): return render_to_string( - "webapp:tg_message.tpl", + "tg_message.tpl", {"heading": heading, "title": title, "description": description, "url": url}, ) diff --git a/webapp/templates/base.html b/webapp/templates/base.html index 83a452a..d785f01 100644 --- a/webapp/templates/base.html +++ b/webapp/templates/base.html @@ -14,14 +14,14 @@
{% block header %} - {% include "webapp:header.html" %} + {% include "header.html" %} {% endblock %}
{% block navigation %} - {% include "webapp:navigation.html" %} + {% include "navigation.html" %} {% endblock %}
@@ -33,6 +33,6 @@ {% block footer %} - {% include "webapp:footer.html" %} + {% include "footer.html" %} {% endblock footer %} {% endblock %} diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html index e24dd70..d85bcb8 100644 --- a/webapp/templates/contact.html +++ b/webapp/templates/contact.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/event_calendar.html b/webapp/templates/event_calendar.html index 7e7fdde..a2e99be 100644 --- a/webapp/templates/event_calendar.html +++ b/webapp/templates/event_calendar.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/freshmen.html b/webapp/templates/freshmen.html index 5c5e306..2702258 100644 --- a/webapp/templates/freshmen.html +++ b/webapp/templates/freshmen.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/guild.html b/webapp/templates/guild.html index 8fb0d41..adc37db 100644 --- a/webapp/templates/guild.html +++ b/webapp/templates/guild.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/index.html b/webapp/templates/index.html index 539475c..2cf0926 100644 --- a/webapp/templates/index.html +++ b/webapp/templates/index.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% load i18n %} {% block content %} diff --git a/webapp/templates/international.html b/webapp/templates/international.html index 85a8b32..f07c322 100644 --- a/webapp/templates/international.html +++ b/webapp/templates/international.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/jobs.html b/webapp/templates/jobs.html index 46310e5..d07cd96 100644 --- a/webapp/templates/jobs.html +++ b/webapp/templates/jobs.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/templates/sosso.html b/webapp/templates/sosso.html index 52a24a8..f96a7ff 100644 --- a/webapp/templates/sosso.html +++ b/webapp/templates/sosso.html @@ -1,4 +1,4 @@ -{% extends "webapp:base.html" %} +{% extends "base.html" %} {% block content %} {% load i18n %} diff --git a/webapp/utils.py b/webapp/utils.py index c1f6dff..58bbfde 100644 --- a/webapp/utils.py +++ b/webapp/utils.py @@ -106,7 +106,7 @@ def send_email(to: str, subject: str, body: str, html: bool = False): def send_signup_email(to, subject, id, uuid, content): message = render_to_string( - "webapp:signup_email.html", + "signup_email.html", { "url": f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}", "content": markdown.markdown(content),