moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-72321 datafilter: Stop disabling jointype field

Browse source 
This was causing behat test failures due to the test trying to
set the disabled jointype field before the filter type was selected.
This commit is contained in:
Mark Johnson 2023-09-01 16:30:40 +01:00 • committed by Andrew Nicols
parent 7d6ed82571
commit 4b160a7c7b
No known key found for this signature in database
GPG key ID: 6D1E3157C8CFBF14
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/amd/build/datafilter.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
lib/amd/build/datafilter.min.js.map
View file

File diff suppressed because one or more lines are too long

1
lib/amd/src/datafilter.js
View file

@ -203,7 +203,6 @@ export default class {
// Update the join list. // Update the join list.
this.updateJoinList(JSON.parse(filterDataNode.dataset.joinList), filterRow); this.updateJoinList(JSON.parse(filterDataNode.dataset.joinList), filterRow);
const joinField = filterRow.querySelector(Selectors.filter.fields.join); const joinField = filterRow.querySelector(Selectors.filter.fields.join);
joinField.disabled = false;
if (!isNaN(filterJoin)) { if (!isNaN(filterJoin)) {
joinField.value = filterJoin; joinField.value = filterJoin;
} }

2
lib/templates/datafilter/filter_row.mustache
View file

@ -39,7 +39,7 @@
<div class="border-radius my-2 p-2 bg-white border d-flex flex-column flex-md-row align-items-md-stretch mr-0 ml-0 row"> <div class="border-radius my-2 p-2 bg-white border d-flex flex-column flex-md-row align-items-md-stretch mr-0 ml-0 row">
<div class="d-flex flex-column flex-md-row align-items-md-center my-1"> <div class="d-flex flex-column flex-md-row align-items-md-center my-1">
<label for="core-filter_row-jointype-{{uniqid}}" class="mr-md-2 mb-md-0">{{#str}}match{{/str}}</label> <label for="core-filter_row-jointype-{{uniqid}}" class="mr-md-2 mb-md-0">{{#str}}match{{/str}}</label>
<select class="custom-select mb-1 mb-md-0 mr-md-2" data-filterfield="join" id="core-filter_row-jointype-{{uniqid}}" disabled> <select class="custom-select mb-1 mb-md-0 mr-md-2" data-filterfield="join" id="core-filter_row-jointype-{{uniqid}}">
<option value="0">{{#str}}none{{/str}}</option> <option value="0">{{#str}}none{{/str}}</option>
<option selected=selected value="1">{{#str}}any{{/str}}</option> <option selected=selected value="1">{{#str}}any{{/str}}</option>
<option value="2">{{#str}}all{{/str}}</option> <option value="2">{{#str}}all{{/str}}</option>