Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LBMC
yvertlab
mylabstocks
Commits
ee1db268
Commit
ee1db268
authored
Oct 08, 2021
by
Guillaume Pommier
Browse files
Bugfix first logic was not taken into account
parent
6dc887cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/Frontend/PlasmidController.php
View file @
ee1db268
...
...
@@ -30,7 +30,9 @@ class PlasmidController extends Controller
if
(
request
()
->
ajax
())
{
$query
=
Plasmid
::
query
()
->
when
(
request
()
->
searchBuilder
,
function
(
$query
,
$searchBuilderAjaxRequest
)
{
$criteria
=
$searchBuilderAjaxRequest
[
'criteria'
];
\
Log
::
debug
(
$criteria
);
$logic
=
$searchBuilderAjaxRequest
[
'logic'
];
\
Log
::
debug
(
$logic
);
$query
=
$this
->
buildRecursiveQuery
(
$query
,
$criteria
,
$logic
);
});
...
...
app/Traits/Frontend/SearchBuilder.php
View file @
ee1db268
...
...
@@ -13,9 +13,15 @@ trait SearchBuilder
// Recursive
$subCriteria
=
$item
[
'criteria'
];
$subLogic
=
$item
[
'logic'
];
$query
->
where
(
function
(
$query
)
use
(
$subCriteria
,
$subLogic
)
{
$this
->
buildRecursiveQuery
(
$query
,
$subCriteria
,
$subLogic
);
});
if
(
$logic
==
'OR'
)
{
$query
->
orWhere
(
function
(
$query
)
use
(
$subCriteria
,
$subLogic
)
{
$this
->
buildRecursiveQuery
(
$query
,
$subCriteria
,
$subLogic
);
});
}
else
{
$query
->
where
(
function
(
$query
)
use
(
$subCriteria
,
$subLogic
)
{
$this
->
buildRecursiveQuery
(
$query
,
$subCriteria
,
$subLogic
);
});
}
}
else
{
// Apply criteria
...
...
Gael Yvert
@gyvert
mentioned in issue
#25
·
Dec 10, 2021
mentioned in issue
#25
mentioned in issue #25
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment