Merge branch 'MDL-72789-311' of https://github.com/paulholden/moodle …

…into MOODLE_311_STABLE
moodle · Dec 3, 2021 · 5f28929 · 5f28929
2 parents a96887e + 4d08b63
commit 5f28929
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...ui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js b/...ui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js
@@ -201,7 +201,8 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                fullComponentText = Y.Node.create(this.get('tabledata')[i].component).get('text'),
+                componentFilterValue = fullComponentText.toLowerCase() === componentFilter,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.

diff --git a/.../yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js b/.../yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js
diff --git a/...list/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js b/...list/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js
@@ -201,7 +201,8 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                fullComponentText = Y.Node.create(this.get('tabledata')[i].component).get('text'),
+                componentFilterValue = fullComponentText.toLowerCase() === componentFilter,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.

diff --git a/report/eventlist/yui/src/eventfilter/js/eventfilter.js b/report/eventlist/yui/src/eventfilter/js/eventfilter.js
@@ -199,7 +199,8 @@ Y.extend(EventFilter, Y.Base, {
             // These variables will either be false or true depending on the statement outcome.
             var fullEventText = Y.Node.create(this.get('tabledata')[i].fulleventname).get('text'),
                 eventNameValue = fullEventText.toLowerCase().indexOf(eventNameFilter) >= 0,
-                componentFilterValue = this.get('tabledata')[i].component.toLowerCase().indexOf(componentFilter) >= 0,
+                fullComponentText = Y.Node.create(this.get('tabledata')[i].component).get('text'),
+                componentFilterValue = fullComponentText.toLowerCase() === componentFilter,
                 eduLevelFilterValue = this.get('tabledata')[i].edulevel.toLowerCase().indexOf(eduLevelFilter) >= 0,
                 crudFilterValue = this.get('tabledata')[i].crud.toLowerCase().indexOf(crudFilter) >= 0;
             // If the name field is empty then add to the filter.