jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389474 )
Change subject: BSFoundation: Added real client side filter falidation to ExtJS
string field grid filter
......................................................................
BSFoundation: Added real client side filter falidation to ExtJS string field
grid filter
=> Needs cherry-pick to master
Change-Id: I2a41c90b0423c89655df625c5e7d01c4f5e3b4b2
---
M resources/bluespice.extjs/Ext.ux/grid/filter/StringFilter.js
1 file changed, 13 insertions(+), 4 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/bluespice.extjs/Ext.ux/grid/filter/StringFilter.js
b/resources/bluespice.extjs/Ext.ux/grid/filter/StringFilter.js
index 5b00c2a..dfb0a89 100644
--- a/resources/bluespice.extjs/Ext.ux/grid/filter/StringFilter.js
+++ b/resources/bluespice.extjs/Ext.ux/grid/filter/StringFilter.js
@@ -95,16 +95,25 @@
* @return {Boolean} true if the record is valid within the bounds
* of the filter, false otherwise.
*/
- validateRecord: function(record) {
+ validateRecord: function( record ) {
var val = record.get(this.dataIndex),
values = this.getValue();
- if (values.eq !== undefined && val != values.eq) {
+ if (values.eq !== undefined && values.eq !== '' && val.toLowerCase()
!== values.eq.toLowerCase() ) {
return false;
}
- if (values.lt !== undefined && val >= values.lt) {
+ if( values.neq !== undefined && values.neq !== '' && val.toLowerCase()
=== values.neq.toLowerCase() ) {
return false;
}
- if (values.gt !== undefined && val <= values.gt) {
+ if( values.ct !== undefined && values.ct !== '' &&
val.toLowerCase().indexOf( values.ct.toLowerCase() ) === -1 ) {
+ return false;
+ }
+ if( values.nct !== undefined && values.nct !== '' &&
val.toLowerCase().indexOf( values.nct.toLowerCase() ) !== -1 ) {
+ return false;
+ }
+ if( values.sw !== undefined && values.sw !== '' &&
val.toLowerCase().indexOf( values.sw.toLowerCase() ) !== 0 ) {
+ return false;
+ }
+ if( values.ew !== undefined && values.ew !== '' &&
val.toLowerCase().endsWith( values.ew.toLowerCase() ) !== true ) {
return false;
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/389474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a41c90b0423c89655df625c5e7d01c4f5e3b4b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
