From f42ee02f82ced59576ddb222ef8064dbbbe9e467 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 14 Jul 2025 23:48:59 +0100
Subject: [PATCH] MDL-86015 mod_assign: preserve advanced grading modal
 dropdown state.

Don't autoclose it when clicking inside the dropdown element. Fixes
change of behaviour during the Bootstrap 5 upgrade.
---
 public/mod/assign/classes/output/grading_actionmenu.php     | 1 +
 .../actionbar/grading/extra_filters_dropdown_body.mustache  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/mod/assign/classes/output/grading_actionmenu.php b/public/mod/assign/classes/output/grading_actionmenu.php
index eb5f42341e0..190dea8484f 100644
--- a/public/mod/assign/classes/output/grading_actionmenu.php
+++ b/public/mod/assign/classes/output/grading_actionmenu.php
@@ -390,6 +390,7 @@ class grading_actionmenu implements templatable, renderable {
             [
                 'classes' => 'extrafilters d-flex',
                 'buttonclasses' => 'btn d-flex border-none align-items-center dropdown-toggle p-0',
+                'autoclose' => 'outside',
             ]
         );
     }
diff --git a/public/mod/assign/templates/actionbar/grading/extra_filters_dropdown_body.mustache b/public/mod/assign/templates/actionbar/grading/extra_filters_dropdown_body.mustache
index 98bdf4de27c..c33949c8401 100644
--- a/public/mod/assign/templates/actionbar/grading/extra_filters_dropdown_body.mustache
+++ b/public/mod/assign/templates/actionbar/grading/extra_filters_dropdown_body.mustache
@@ -71,7 +71,7 @@
         <input type="hidden" name="action" value="{{action}}">
         {{#filters}}
             {{#markingworkflow}}
-                <div class="d-flex flex-wrap m-0 pb-3">
+                <div class="d-flex flex-wrap gap-2 m-0 pb-3">
                     <label class="w-100" for="filter-workflow-{{uniqid}}">
                         {{#str}}markingstate, mod_assign{{/str}}
                     </label>
@@ -83,7 +83,7 @@
                 </div>
             {{/markingworkflow}}
             {{#markingallocation}}
-                <div class="d-flex flex-wrap m-0 pb-3">
+                <div class="d-flex flex-wrap gap-2 m-0 pb-3">
                     <label class="w-100" for="filter-marking-allocation-{{uniqid}}">
                         {{#str}}marker, mod_assign{{/str}}
                     </label>
@@ -95,7 +95,7 @@
                 </div>
             {{/markingallocation}}
             {{#suspendedparticipants}}
-                <div class="d-flex flex-wrap m-0 pb-3 pt-2 mx-1 align-items-center">
+                <div class="d-flex flex-wrap gap-2 m-0 pb-3 pt-2 mx-1 align-items-center">
                     <input type="hidden" name="suspendedparticipantsfilter" value="0" {{#active}}disabled{{/active}}>
                     <input type="checkbox" id="filter-suspended-participants-{{uniqid}}" name="suspendedparticipantsfilter" value="1" {{#active}}checked{{/active}}>
                     <label for="filter-suspended-participants-{{uniqid}}" class='m-0' >{{#str}} includesuspendedparticipants, mod_assign {{/str}}</label>