mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 13:38:32 +01:00
Code Issues Projects Releases Wiki Activity

MDL-80241 grade: update user filtering by matched properties.

Browse Source 
Invert the previous logic, which maintained a "banned" list of
fields, to instead only try to filter on those fields that are
explicitly defined to support that.
This commit is contained in:
Paul Holden 2024-01-18 19:57:56 +00:00
parent d3ad77e476
commit 0a66e9a3f8
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/amd/build/comboboxsearch/user.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
user/amd/build/comboboxsearch/user.min.js.map
View File

File diff suppressed because one or more lines are too long

12
user/amd/src/comboboxsearch/user.js
View File

@ -30,7 +30,6 @@ export default class UserSearch extends search_combobox {
courseID;
groupID;
bannedFilterFields = ['profileimageurlsmall', 'profileimageurl', 'id', 'link', 'matchingField', 'matchingFieldName'];
// A map of user profile field names that is human-readable.
profilestringmap = null;
@ -118,8 +117,9 @@ export default class UserSearch extends search_combobox {
* @returns {Array} The users that match the given criteria.
*/
async filterDataset(filterableData) {
const stringMap = await this.getStringMap();
return filterableData.filter((user) => Object.keys(user).some((key) => {
if (user[key] === "" || user[key] === null || this.bannedFilterFields.includes(key)) {
if (user[key] === "" || user[key] === null || !stringMap.get(key)) {
return false;
}
return user[key].toString().toLowerCase().includes(this.getPreppedSearchTerm());
@ -145,9 +145,10 @@ export default class UserSearch extends search_combobox {
const preppedSearchTerm = this.getPreppedSearchTerm();
const searchTerm = this.getSearchTerm();
if (valueString.includes(preppedSearchTerm) && !this.bannedFilterFields.includes(key)) {
// Ensure we have a good string, otherwise fallback to the key.
user.matchingFieldName = stringMap.get(key) ?? key;
// Ensure we match only on expected keys.
const matchingFieldName = stringMap.get(key);
if (matchingFieldName && valueString.includes(preppedSearchTerm)) {
user.matchingFieldName = matchingFieldName;
// Safely prepare our matching results.
const escapedValueString = valueString.replace(/</g, '&lt;');
@ -282,6 +283,7 @@ export default class UserSearch extends search_combobox {
if (!this.profilestringmap) {
const requiredStrings = [
'username',
'fullname',
'firstname',
'lastname',
'email',