revert change of show_selected

Uninett · Dec 18, 2024 · 529b835 · 529b835
1 parent d38b0c4
commit 529b835
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/argus/htmx/incidents/filter.py b/src/argus/htmx/incidents/filter.py
@@ -10,13 +10,17 @@
 QuerySetFilter = filter_backend.QuerySetFilter
 
 
+class BadgeDropdownMultiSelect(DropdownMultiSelect):
+    template_name = "htmx/incidents/widgets/incident_source_select.html"
+
+
 class IncidentFilterForm(forms.Form):
     open = forms.BooleanField(required=False)
     closed = forms.BooleanField(required=False)
     acked = forms.BooleanField(required=False)
     unacked = forms.BooleanField(required=False)
     source = forms.MultipleChoiceField(
-        widget=DropdownMultiSelect(
+        widget=BadgeDropdownMultiSelect(
             attrs={"placeholder": "select sources..."},
             extra={
                 "hx_get": "htmx:incidents-filter",

diff --git a/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html b/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html
@@ -14,7 +14,7 @@
       {% for option in options %}
         {% if option.selected %}
           {% block show_selected %}
-            <span class="badge badge-primary">{{ option.label }}</span>
+            <p class="text-primary italic font-medium">{{ option.label }},</p>
           {% endblock show_selected %}
         {% endif %}
       {% endfor %}

diff --git a/src/argus/htmx/templates/htmx/incidents/widgets/incident_source_select.html b/src/argus/htmx/templates/htmx/incidents/widgets/incident_source_select.html
@@ -0,0 +1,4 @@
+{% extends "htmx/forms/dropdown_select_multiple.html" %}
+{% block show_selected %}
+  <span class="badge badge-primary">{{ option.label }}</span>
+{% endblock show_selected %}