Skip to content

Fix SearchPanes and SearchBuilder not pre-filtering data #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix SearchPanes and SearchBuilder not pre-filtering data #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddbc7a6
Merge pull request #1 from DataTables/master
gotmoo Jan 12, 2024
799ebf9
Expose private _GetWhere internally as GetGlobalWhere
gotmoo Jan 12, 2024
f286b56
Apply editor.GetGlobalWhere in applicable queries for SearchPane and …
gotmoo Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions DataTables-Editor-Server/Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,13 @@ internal HttpRequest Request()
return _request;
}

/// <summary>
/// Apply the global Where filter to the supplied Query
/// </summary>
internal void GetGlobalWhere(Query query)
{
_GetWhere(query);
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Private methods
Expand Down
3 changes: 2 additions & 1 deletion DataTables-Editor-Server/SearchBuilderOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ internal List<Dictionary<string, object>> Exec(Field fieldIn, Editor editor, Lis
var query = db.Query("select")
.Table(this._table)
.LeftJoin(_leftJoin);

editor.GetGlobalWhere(query);

if(fieldIn.Apply("get") && fieldIn.GetValue() == null){
query
.Get(this._value + " as value")
Expand Down
2 changes: 2 additions & 0 deletions DataTables-Editor-Server/SearchPaneOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ internal List<Dictionary<string, object>> Exec(Field fieldIn, Editor editor, Lis
.GroupBy(value)
.Where(_where)
.LeftJoin(join);
editor.GetGlobalWhere(q);

if (viewTotal) {
q.Get("COUNT(*) as total");
Expand Down Expand Up @@ -330,6 +331,7 @@ internal List<Dictionary<string, object>> Exec(Field fieldIn, Editor editor, Lis
.Distinct(true)
.Table(table)
.LeftJoin(join);
editor.GetGlobalWhere(entriesQuery);

if (fieldIn.Apply("get") && fieldIn.GetValue() == null) {
gettingCount = true;
Expand Down