Merge branch 'MDL-80241-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE
This commit is contained in:
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -35,7 +35,6 @@ const selectors = {
|
||||
};
|
||||
const component = document.querySelector(selectors.component);
|
||||
const courseID = component.querySelector(selectors.courseid).dataset.courseid;
|
||||
const bannedFilterFields = ['profileimageurlsmall', 'profileimageurl', 'id', 'link', 'matchingField', 'matchingFieldName'];
|
||||
|
||||
export default class UserSearch extends GradebookSearchClass {
|
||||
|
||||
@@ -108,8 +107,9 @@ export default class UserSearch extends GradebookSearchClass {
|
||||
* @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] === "" || bannedFilterFields.includes(key)) {
|
||||
if (user[key] === "" || !stringMap.get(key)) {
|
||||
return false;
|
||||
}
|
||||
return user[key].toString().toLowerCase().includes(this.getPreppedSearchTerm());
|
||||
@@ -260,6 +260,7 @@ export default class UserSearch extends GradebookSearchClass {
|
||||
if (!this.profilestringmap) {
|
||||
const requiredStrings = [
|
||||
'username',
|
||||
'fullname',
|
||||
'firstname',
|
||||
'lastname',
|
||||
'email',
|
||||
|
||||
Reference in New Issue
Block a user