allow entity query conditions to be disabled #577
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pavlosdan
changed the title
Codecov Report
@@ Coverage Diff @@
## 8.x-3.x #577 +/- ##
===========================================
- Coverage 80.79% 80.74% -0.06%
===========================================
Files 186 186
Lines 2854 2861 +7
===========================================
+ Hits 2306 2310 +4
- Misses 548 551 +3
Continue to review full report at Codecov.
|
fubhy
requested changes
Apr 17, 2018
| @@ -297,6 +301,13 @@ protected function buildFilterConditions(QueryInterface $query, array $filter) { | |||
| // Apply filter conditions. | |||
| $conditions = !empty($filter['conditions']) ? $filter['conditions'] : []; | |||
| foreach ($conditions as $condition) { | |||
| // Set the condition to enabled by default. | |||
| $enabled = (isset($condition['enabled'])) ? $condition['enabled'] : true; | |||
There was a problem hiding this comment.
We support "default" values in the annotation. I think it would be better to use that:
"enabled" = {
"default" = TRUE
"type" = "Boolean"
}
| @@ -270,7 +270,11 @@ protected function applySort(QueryInterface $query, $sort) { | |||
| */ | |||
| protected function applyFilter(QueryInterface $query, $filter) { | |||
| if (!empty($filter) && is_array($filter)) { | |||
| $query->condition($this->buildFilterConditions($query, $filter)); | |||
| //Conditions can be disabled. Check we are not adding an empty condition group. | |||
| $filter_conditions = $this->buildFilterConditions($query, $filter); | |||
There was a problem hiding this comment.
We use camelCase in our code ($filterConditions)
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#576