From b8177caadbb774e9753fd3f7b01ef2a2d84d74de Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 11 Oct 2021 17:15:44 +0100
Subject: [PATCH] MDL-72498 report_eventlist: fix filtering by component.

Match on the component frankenstyle name rather than it's lang
string.
---
 ...odle-report_eventlist-eventfilter-debug.js | Bin 9783 -> 9611 bytes
 ...moodle-report_eventlist-eventfilter-min.js | Bin 3396 -> 3284 bytes
 .../moodle-report_eventlist-eventfilter.js    | Bin 9783 -> 9611 bytes
 .../yui/src/eventfilter/js/eventfilter.js     |   4 +---
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-debug.js
index 34cc92a6a4bdeb38209b2b3154a69356fe4d9f28..617edac493c616dd6dde6aa366985feaf9410ca2 100644
GIT binary patch
delta 65
zcmdn))9t<ChWO;!lERy(NocW5j+0SQR*#8MSI|~S&d)8#&r8iK2}{f=O$7=7#Z$|G
Qe4zB?i82zK6=cOZ0r%_`ssI20

delta 123
zcmeD7-tM#EhWKPB38Bfa#W`)<GIL5&ixg}XN-{Ew_2QHBa|`nGQu9jm(o;(`)bk5U
zGV}9_)iw1pOHy++(9}$xCgHgGsCWR&<X<vU>`<MP6=fti;l@mUAT2jpR9<{>w+tr$
DGWab|

diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter-min.js
index 292bdc17e6d031a211f66aa0209ecbc05f64b4c6..110843d3546b61f33a2010d08cd118b4c00744ee 100644
GIT binary patch
delta 184
zcmX>ibwzRm3kQ=<(PS15oypTU7EYebDKy!W(~B{F@)S-__8eOS8(WQ%$qzZ57&Rw9
z;1Zu)&BY0#MU`S=l(dVrfmCW)YF-JDr>T=Uxt`0OF>&&KE{l*dO&ujATU*;AH8qVK
zTSWsP*8s#X2J-We_@zL8CK5j$$WH|GbJW!G)YLN7)DqRyQuGQ+i!&xqWE9(+$o-fR
E03n<*tN;K2

delta 228
zcmca2c|>Xh3&&(O4jsWF+mejTV!im}{M>^4ywtps$%!1&oCw}O4#UYt91D5kVd{!X
zQ$R{4|Kc#6e3?UNvLmMjONp(4&Ey77r^(AW_$JqJak3<8>f}uJ=aS=qn_9pn&QheQ
zlQ)^4%bqb4C}$B8uc@P?WNT}isHUb-VykEX<QjnZ#Xx=z62BD4&qLyu0r{C=eu<h|
dj+$DYnp&osT8dslX>rEniHu^KKXN^01OOvFLp1;Z

diff --git a/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js b/report/eventlist/yui/build/moodle-report_eventlist-eventfilter/moodle-report_eventlist-eventfilter.js
index 34cc92a6a4bdeb38209b2b3154a69356fe4d9f28..617edac493c616dd6dde6aa366985feaf9410ca2 100644
GIT binary patch
delta 65
zcmdn))9t<ChWO;!lERy(NocW5j+0SQR*#8MSI|~S&d)8#&r8iK2}{f=O$7=7#Z$|G
Qe4zB?i82zK6=cOZ0r%_`ssI20

delta 123
zcmeD7-tM#EhWKPB38Bfa#W`)<GIL5&ixg}XN-{Ew_2QHBa|`nGQu9jm(o;(`)bk5U
zGV}9_)iw1pOHy++(9}$xCgHgGsCWR&<X<vU>`<MP6=fti;l@mUAT2jpR9<{>w+tr$
DGWab|

diff --git a/report/eventlist/yui/src/eventfilter/js/eventfilter.js b/report/eventlist/yui/src/eventfilter/js/eventfilter.js
index 771b2669481..adf481b9140 100644
--- a/report/eventlist/yui/src/eventfilter/js/eventfilter.js
+++ b/report/eventlist/yui/src/eventfilter/js/eventfilter.js
@@ -179,8 +179,6 @@ Y.extend(EventFilter, Y.Base, {
     _totalFilter: function() {
         // Get all of the details of the filter elements
         var eventNameFilter = this._eventName.get('value').toLowerCase(),
-            // Component selected text.
-            componentFilter = this._component.get('options').item(this._component.get('selectedIndex')).get('text').toLowerCase(),
             // Component selected value.
             componentValue = this._component.get('value'),
             // Education level selected text.
@@ -199,7 +197,7 @@ 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,
+                componentFilterValue = fullEventText.toLowerCase().indexOf('\\' + componentValue + '\\event\\') >= 0,
                 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.
-- 
2.43.0