Skip to content

[6.x] Fix default: current on Users fieldtype and Eloquent/Postgres #14724

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
joshuablum wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+16 −1
Open

[6.x] Fix default: current on Users fieldtype and Eloquent/Postgres #14724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4688100
Correctly resolve `default: current`
joshuablum May 25, 2026
d0d3d37
Add test
joshuablum May 25, 2026
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
6 changes: 5 additions & 1 deletion src/Fieldtypes/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@ public function augment($values)
{
$single = $this->config('max_items') === 1;

$ids = Arr::wrap($values);
$ids = collect(Arr::wrap($values))
->map(fn ($id) => $id === 'current' ? User::current()?->id() : $id)
->filter()
->values()
->all();

$query = (new OrderedQueryBuilder(User::query(), $ids))->whereIn('id', $ids);

Expand Down
11 changes: 11 additions & 0 deletions tests/Fieldtypes/UsersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@ public function it_augments_to_a_single_user_when_max_items_is_one()
$this->assertEquals('one@domain.com', $augmented->email());
}

#[Test]
public function it_augments_the_current_user_when_value_is_the_current_string()
{
$this->actingAs(Facades\User::find('123'));

$augmented = $this->fieldtype(['max_items' => 1])->augment('current');

$this->assertInstanceOf(User::class, $augmented);
$this->assertEquals('123', $augmented->id());
}

#[Test]
public function it_shallow_augments_to_a_collection_of_users()
{
Expand Down
Loading