TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Aarni Halinen
2022-08-01 22:29:06 +03:00
parent 2628d753f5
commit 321d45b628
31 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infoscreen/templates/infoscreen_admin.html
+1 -1
View File
@@ -40,5 +40,5 @@
</div> </div>
</div> </div>
{% include "webapp:footer.html" %} {% include "footer.html" %}
{% endblock body %} {% endblock body %}
members/templates/application_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/application_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/application_form_base.html
+1 -1
View File
@@ -35,6 +35,6 @@
<body> <body>
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
{% include "webapp:footer.html" %} {% include "footer.html" %}
</body> </body>
</html> </html>
members/templates/application_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
members/templates/base.html
+1 -1
View File
@@ -91,6 +91,6 @@
</div> </div>
</div> </div>
{% include "webapp:footer.html" %} {% include "footer.html" %}
</body> </body>
</html> </html>
members/templates/member_add.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load bootstrap3 %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
members/templates/member_add_many.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
members/templates/member_add_many_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
members/templates/member_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/member_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/member_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
members/templates/payment_add.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load bootstrap3 %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
members/templates/payment_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/payment_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
members/templates/payment_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
members/templates/settings.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
members/templates/upload_form.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
members/views/applications.py
+2 -2
View File
@@ -101,7 +101,7 @@ def application_accept(request, *args, **kwargs):
subject = _("Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!") subject = _("Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!")
message = render_to_string( message = render_to_string(
"members:email_application_accept.html", "email_application_accept.html",
{"first_name": application.first_name}, {"first_name": application.first_name},
) )
send_email(member.email, subject, message, True) send_email(member.email, subject, message, True)
@@ -186,7 +186,7 @@ def application_submit(request, *args, **kwargs):
) )
message = render_to_string( message = render_to_string(
"members:email_application_submit.html", "email_application_submit.html",
{ {
"application": application, "application": application,
"ayy": _("Kyllä") if application.AYY else _("Ei"), "ayy": _("Kyllä") if application.AYY else _("Ei"),
templates/error.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members:base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
webapp/models.py
+1 -1
View File
@@ -279,7 +279,7 @@ class JobAd(models.Model):
def generateMessage(heading: str, title: str, description: str, url: str): def generateMessage(heading: str, title: str, description: str, url: str):
return render_to_string( return render_to_string(
"webapp:tg_message.tpl", "tg_message.tpl",
{"heading": heading, "title": title, "description": description, "url": url}, {"heading": heading, "title": title, "description": description, "url": url},
) )
webapp/templates/base.html
+3 -3
View File
@@ -14,14 +14,14 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
{% block header %} {% block header %}
{% include "webapp:header.html" %} {% include "header.html" %}
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
{% block navigation %} {% block navigation %}
{% include "webapp:navigation.html" %} {% include "navigation.html" %}
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
@@ -33,6 +33,6 @@
</div> </div>
</div> </div>
{% block footer %} {% block footer %}
{% include "webapp:footer.html" %} {% include "footer.html" %}
{% endblock footer %} {% endblock footer %}
{% endblock %} {% endblock %}
webapp/templates/contact.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/event_calendar.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/freshmen.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/guild.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/index.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}
webapp/templates/international.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/jobs.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/templates/sosso.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "webapp:base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
{% load i18n %} {% load i18n %}
webapp/utils.py
+1 -1
View File
@@ -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): def send_signup_email(to, subject, id, uuid, content):
message = render_to_string( message = render_to_string(
"webapp:signup_email.html", "signup_email.html",
{ {
"url": f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}", "url": f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}",
"content": markdown.markdown(content), "content": markdown.markdown(content),