MDL-69145 core_user: Set default filter to ALL

diff --git a/user/amd/build/participantsfilter.min.js b/user/amd/build/participantsfilter.min.js
index 1f5b3f0..d99bc1b 100644 (file)
Binary files a/user/amd/build/participantsfilter.min.js and b/user/amd/build/participantsfilter.min.js differ

diff --git a/user/amd/build/participantsfilter.min.js.map b/user/amd/build/participantsfilter.min.js.map
index 05781b4..63fcd31 100644 (file)
Binary files a/user/amd/build/participantsfilter.min.js.map and b/user/amd/build/participantsfilter.min.js.map differ

diff --git a/user/amd/src/participantsfilter.js b/user/amd/src/participantsfilter.js
index 3f17241..c084f58 100644 (file)
--- a/user/amd/src/participantsfilter.js
+++ b/user/amd/src/participantsfilter.js
@@ -337,8 +337,8 @@ export const init = participantsRegionId => {
 
         if (filters.length === 1) {
             filterSet.querySelector(Selectors.filterset.regions.filtermatch).classList.add('hidden');
-            filterSet.querySelector(Selectors.filterset.fields.join).value = 1;
-            filterSet.dataset.filterverb = 1;
+            filterSet.querySelector(Selectors.filterset.fields.join).value = 2;
+            filterSet.dataset.filterverb = 2;
         } else {
             filterSet.querySelector(Selectors.filterset.regions.filtermatch).classList.remove('hidden');
         }

diff --git a/user/templates/participantsfilter.mustache b/user/templates/participantsfilter.mustache
index e9315f8..fc9a8b8 100644 (file)
--- a/user/templates/participantsfilter.mustache
+++ b/user/templates/participantsfilter.mustache
@@ -40,7 +40,7 @@
     }
 }}
 
-<div id="core_user-participantsfilter-{{uniqid}}" class="filter-group my-2 p-2 bg-light border-radius border" data-table-region="{{tableregionid}}" data-table-course-id="{{courseid}}" data-filterverb="1">
+<div id="core_user-participantsfilter-{{uniqid}}" class="filter-group my-2 p-2 bg-light border-radius border" data-table-region="{{tableregionid}}" data-table-course-id="{{courseid}}" data-filterverb="2">
     <div data-filterregion="filtermatch" class="hidden">
         <label for="core_user-local-participantsfilter-jointype-{{uniqid}}" class="my-0" aria-hidden="true">
             {{#str}}match, core_user{{/str}}
@@ -48,8 +48,8 @@
         <select class="custom-select" data-filterfield="join" id="core_user-local-participantsfilter-jointype-{{uniqid}}"
                 aria-label="{{#str}}filtersetmatchdescription, core_user{{/str}}">
             <option value="0">{{#str}}none{{/str}}</option>
-            <option selected=selected value="1">{{#str}}any{{/str}}</option>
-            <option value="2">{{#str}}all{{/str}}</option>
+            <option value="1">{{#str}}any{{/str}}</option>
+            <option value="2" selected>{{#str}}all{{/str}}</option>
         </select>
         <span aria-hidden="true">{{#str}}matchofthefollowing, core_user{{/str}}</span>
     </div>

diff --git a/user/tests/behat/filter_participants.feature b/user/tests/behat/filter_participants.feature
index e962dfc..b957693 100644 (file)
--- a/user/tests/behat/filter_participants.feature
+++ b/user/tests/behat/filter_participants.feature
@@ -707,7 +707,7 @@ Feature: Course participants can be filtered
     And I should not see "Student 4" in the "participants" "table"
     And I should not see "Teacher 1" in the "participants" "table"
     And I click on "Add condition" "button"
-    # Re-add a second filter and ensure the default (any) filterset match type is set.
+    # Re-add a second filter and ensure the default (All) filterset match type is set.
     And I set the field "Match" in the "Filter 2" "fieldset" to "All"
     And I set the field "type" in the "Filter 2" "fieldset" to "Role"
     And I click on ".form-autocomplete-downarrow" "css_element" in the "Filter 2" "fieldset"
@@ -716,7 +716,7 @@ Feature: Course participants can be filtered
     And I should see "Student 1" in the "participants" "table"
     And I should see "Student 2" in the "participants" "table"
     And I should see "Student 3" in the "participants" "table"
-    And I should see "Student 4" in the "participants" "table"
+    And I should not see "Student 4" in the "participants" "table"
     And I should not see "Teacher 1" in the "participants" "table"
 
   @javascript