Re-enable HTML in registration status message (#3617)

* Re-enable HTML in registration status message * Strip HTML tags in CalendarJS * Enable overriding all event status messages in admin
svthalia · Apr 10, 2024 · 60d9441 · 60d9441
1 parent 743ab0b
commit 60d9441
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/website/events/admin/event.py b/website/events/admin/event.py
@@ -98,7 +98,26 @@ class EventAdmin(DoNextModelAdmin):
                     "cancel_deadline",
                     "send_cancel_email",
                     "optional_registrations",
+                ),
+                "classes": ("collapse",),
+            },
+        ),
+        (
+            _("Registration status messages"),
+            {
+                "fields": (
                     "no_registration_message",
+                    "registration_msg_optional",
+                    "registration_msg_optional_registered",
+                    "registration_msg_registered",
+                    "registration_msg_open",
+                    "registration_msg_full",
+                    "registration_msg_waitinglist",
+                    "registration_msg_will_open",
+                    "registration_msg_expired",
+                    "registration_msg_cancelled",
+                    "registration_msg_cancelled_late",
+                    "registration_msg_cancelled_final",
                 ),
                 "classes": ("collapse",),
             },

diff --git a/website/events/static/events/js/main.js b/website/events/static/events/js/main.js
@@ -50,6 +50,11 @@ function checkViewState(calendar) {
     }
 }
 
+function strip(html){
+   let doc = new DOMParser().parseFromString(html, 'text/html');
+   return doc.body.textContent || "";
+}
+
 document.addEventListener('DOMContentLoaded', function () {
     let lastKnownWidth = window.innerWidth;
     const calendarEl = document.getElementById('calendar');
@@ -131,7 +136,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 const regInfoElem = document.createElement('div');
                 regInfoElem.classList.add('mt-2', 'fc-title');
                 regInfoElem.title = event.extendedProps.registration_info;
-                regInfoElem.textContent = event.extendedProps.registration_info;
+                regInfoElem.textContent = strip(event.extendedProps.registration_info);
                 el.children[0].appendChild(regInfoElem);
             }
         },

diff --git a/website/events/templates/events/event.html b/website/events/templates/events/event.html
@@ -236,9 +236,9 @@ <h1 class="section-title">
                             <td>
                                 <em>
                                     {% if show_cancel_status %}
-                                        <p>{{ registration_status }} {{cancel_info}}</p>
+                                        <p>{{ registration_status | bleach }} {{cancel_info}}</p>
                                     {% else %}
-                                        <p>{{ registration_status }}</p>
+                                        <p>{{ registration_status | bleach }}</p>
                                     {% endif %}
                                 </em>
                             </td>