From 5f89a565d0909edd95501b9fdcc0edd1556a9633 Mon Sep 17 00:00:00 2001 From: Jindrich Susen Date: Fri, 3 Nov 2023 15:30:36 +0100 Subject: [PATCH] "is null" filter was not working in eager loaded grids --- frontend-html/src/model/entities/FilterConfiguration.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend-html/src/model/entities/FilterConfiguration.ts b/frontend-html/src/model/entities/FilterConfiguration.ts index 2b48c50816..0c5ea25f51 100644 --- a/frontend-html/src/model/entities/FilterConfiguration.ts +++ b/frontend-html/src/model/entities/FilterConfiguration.ts @@ -248,7 +248,7 @@ export class FilterConfiguration implements IFilterConfiguration { } case "Number": { if (cellValue === undefined) return true; - const t1 = prop.column === "Number" ? parseFloat(cellValue) : cellValue; + const t1 = parseFloat(cellValue); switch (term.setting.type) { case "between": { @@ -303,9 +303,9 @@ export class FilterConfiguration implements IFilterConfiguration { if (term.setting.val1 === "" || term.setting.val1 === undefined) return true; return t1 !== parseFloat(term.setting.val1); case "nnull": - return t1 !== null; + return cellValue !== null; case "null": - return t1 === null; + return cellValue === null; } break; }