From c3da3088fb841375eaa97d972154a85f99e3898f Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 9 Jun 2023 16:57:41 -0500 Subject: [PATCH] feat: render charters on about page uring markdown --- ietf/group/views.py | 1 + ietf/templates/group/group_about.html | 3 +-- ietf/templates/group/group_about_rendertest.html | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ietf/group/views.py b/ietf/group/views.py index 95bf4c5e9e..ad6e8283fe 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -166,6 +166,7 @@ def fill_in_charter_info(group, include_drafts=False): group.charter_text = get_charter_text(group) else: group.charter_text = "Not chartered yet." + group.charter_html = markdown.markdown(group.charter_text) def extract_last_name(role): return role.person.name_parts()[3] diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 0ad9813e2f..1734b1f465 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -379,8 +379,7 @@

{% if group.state_id == "proposed" %}proposed{% endif %} {{ group.type.desc.title }}

- {# the linebreaks filter adds

, no surrounding

necessary: #} - {{ group.charter_text|urlize_ietf_docs|linkify|linebreaks }} + {{ group.charter_html }} {% else %}

{% if requested_close or group.state_id == "conclude" %}Final{% endif %} diff --git a/ietf/templates/group/group_about_rendertest.html b/ietf/templates/group/group_about_rendertest.html index 3f57bccc70..b3abf71915 100644 --- a/ietf/templates/group/group_about_rendertest.html +++ b/ietf/templates/group/group_about_rendertest.html @@ -40,15 +40,15 @@ {% block js %} {% endblock %} \ No newline at end of file