From 3694fcfe014fbe05693053d615ab4ba072b715cd Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 21 Sep 2008 22:18:14 +0000 Subject: [PATCH] Fix bug #754 grid not refreshed correctly after modifiying a record value when filter condition set --- source/childwin.pas | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/childwin.pas b/source/childwin.pas index 25811b20..03f9fdf2 100644 --- a/source/childwin.pas +++ b/source/childwin.pas @@ -5532,10 +5532,11 @@ begin else res := @FQueryGridResult; if (not res.Rows[Node.Index].Loaded) and (res.Rows[Node.Index].State <> grsInserted) then begin query := DataGridCurrentSelect; - if DataGridCurrentFilter = '' then begin + // Passed WhereClause has prio over current filter, fixes bug #754 + if WhereClause <> '' then begin query := query + ' WHERE ' + WhereClause; - end else begin - query := query + ' WHERE (' + DataGridCurrentFilter + ') AND (' + WhereClause + ')'; + end else if DataGridCurrentFilter <> '' then begin + query := query + ' WHERE ' + DataGridCurrentFilter; end; // start query