Add: markdown for note field

This commit is contained in:
2023-08-06 17:41:00 +09:00
parent 02a5492cd5
commit 95352ff5f0
5 changed files with 35 additions and 5 deletions

View File

@@ -1,5 +1,6 @@
{% extends 'collector/base.html' %}
{% load static %}
{% load collector_extras %}
{% block title %}<title>{{ title }}</title>{% endblock title %}
{% block main %}
<div class="container mt-3">
@@ -15,7 +16,9 @@
Note:
</div>
<div class="card-body">
<p class="card-text">{{ ticket.note }}</p>
<div class="card-text">
{{ ticket.note | markdown | safe }}
</div>
</div>
</div>
{% endif %}

View File

@@ -1,5 +1,6 @@
{% extends 'collector/base.html' %}
{% load static %}
{% load collector_extras %}
{% block title %}<title>{{ title }}</title>{% endblock title %}
{% block main %}
<div class="container mt-3">
@@ -15,20 +16,21 @@
{% if ticket.note %}
<div class="accordion-item">
<h2 class="accordion-header">
<button
class="accordion-button collapsed"
type="button" data-bs-toggle="collapse"
data-bs-target="#collapse_{{ ticket.number}}_note"
aria-expanded="false"
aria-controls="collapse_{{ ticket.number }}"
>Note</button>
><i class="bi bi-journal-text me-2"></i> Note</button>
</h2>
<div id="collapse_{{ ticket.number }}_note"
class="accordion-collapse collapse"
data-bs-parent="#archive_{{ ticket.number }}_note"
>
<div class="accordion-body">
<p class="mb-1">{{ ticket.note }}</p>
<p class="mb-1">{{ ticket.note |markdown |safe }}</p>
</div>
</div>
</div>
@@ -43,7 +45,7 @@
data-bs-toggle="collapse"
data-bs-target="#collapse_{{ ticket.number }}"
aria-expanded="true" aria-controls="collapse_{{ ticket.number }}"
>Logs</button>
><i class="bi bi-file-zip me-2"></i> Logs</button>
</h3>
<div
id="collapse_{{ ticket.number }}"

View File

@@ -1,4 +1,7 @@
import markdown as md
from django import template
from django.template.defaultfilters import stringfilter
from collector.models import Platform
@@ -46,3 +49,9 @@ def clean_filename(filename: str) -> str:
str: only filename
"""
return filename.rpartition('/')[-1]
@register.filter(name='markdown')
@stringfilter
def markdown(value):
return md.markdown(value, extensions=['markdown.extensions.fenced_code'])