Skip to content
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

Smarten up conditions on Entry fields #3976

Closed
wants to merge 4 commits into from
Closed

Smarten up conditions on Entry fields #3976

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2aa3230
Smarten up conditions on entry & term fields
duncanmcclean Jul 8, 2021
bf2e6df
Hold up, let's just do entries for now
duncanmcclean Jul 8, 2021
228ce49
wip
duncanmcclean Jul 8, 2021
78ca184
Merge branch '3.1' into fix/3954
duncanmcclean Jul 30, 2021
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
9 changes: 8 additions & 1 deletion src/Tags/Concerns/QueriesConditions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Carbon\Carbon;
use Illuminate\Support\Collection;
use Statamic\Contracts\Data\Augmentable;
use Statamic\Contracts\Entries\Entry;
use Statamic\Fields\LabeledValue;
use Statamic\Fields\Value;
use Statamic\Support\Str;
Expand Down Expand Up @@ -316,7 +317,13 @@ protected function getQueryConditionValue($value, $field)
}

if ($value instanceof Augmentable) {
$value = $value->augmentedValue($field);
$augmentedValue = $value->augmentedValue($field);

if (! $augmentedValue && $value instanceof Entry) {
$value = $value->id();
} else {
$value = $augmentedValue;
}
}

if ($value instanceof LabeledValue) {
Expand Down