From 47897d431715295b8dfc88752e9719a53ad51029 Mon Sep 17 00:00:00 2001
From: Maxime Bloch <maxime.bloch@ugent.be>
Date: Tue, 4 Aug 2020 04:15:11 +0200
Subject: [PATCH] Add markdown support for notes

---
 events/__init__.py                   |  3 +++
 events/templates/events/index.html   |  4 +++-
 events/templatetags/__init__.py      |  0
 events/templatetags/events_extras.py | 11 +++++++++++
 requirements.txt                     |  1 +
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 events/templatetags/__init__.py
 create mode 100644 events/templatetags/events_extras.py

diff --git a/events/__init__.py b/events/__init__.py
index e69de29..4bd3b15 100644
--- a/events/__init__.py
+++ b/events/__init__.py
@@ -0,0 +1,3 @@
+from django import template
+
+register = template.Library()
diff --git a/events/templates/events/index.html b/events/templates/events/index.html
index 91f3bc7..8d5ae5f 100644
--- a/events/templates/events/index.html
+++ b/events/templates/events/index.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% load events_extras %}
+
 {% block title %}Events{% endblock %}
 
 {% block content %}
@@ -18,7 +20,7 @@
 				<p>Verantwoordelijke: {{ x.event.responsible_person.username }}</p>
 
 				{% if x.event.note %}
-				<p>Beschrijving: {{ x.event.note }}</p>
+				<p>Beschrijving: {{ x.event.note|markdown_to_html }}</p>
 				{% endif %}
 
 				<ul>
diff --git a/events/templatetags/__init__.py b/events/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/events/templatetags/events_extras.py b/events/templatetags/events_extras.py
new file mode 100644
index 0000000..969723c
--- /dev/null
+++ b/events/templatetags/events_extras.py
@@ -0,0 +1,11 @@
+from django.utils.html import conditional_escape
+from django.utils.safestring import mark_safe
+from markdown import markdown
+
+from events import register
+
+
+@register.filter(name='markdown_to_html', needs_autoescape=False)
+def markdown_to_html(value):
+    result = markdown(value)
+    return mark_safe(result)
diff --git a/requirements.txt b/requirements.txt
index 7c1fab0..5c8998a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,6 +10,7 @@ django-timezone-field==4.0
 future==0.18.2
 idna==2.10
 kombu==4.6.11
+markdown==3.2.2
 mysqlclient==2.0.1
 python-crontab==2.5.1
 python-dateutil==2.8.1