mirror of
https://github.com/filamentphp/filament.git
synced 2026-09-24 15:42:09 +08:00
Merge branch '4.x' of https://github.com/filamentphp/filament into 4.x
This commit is contained in:
@@ -495,7 +495,6 @@ trait InteractsWithActions
|
||||
continue;
|
||||
}
|
||||
|
||||
$resolvedAction->mergeArguments($action['arguments'] ?? []);
|
||||
$resolvedAction->nestingIndex($actionNestingIndex);
|
||||
$resolvedAction->boot();
|
||||
|
||||
|
||||
@@ -145,6 +145,10 @@ class TestsActions
|
||||
...$actions,
|
||||
]);
|
||||
|
||||
if ($action && filled($arguments = Arr::last($actions)['arguments'] ?? [])) {
|
||||
$action->mergeArguments($arguments);
|
||||
}
|
||||
|
||||
$livewireClass = $this->instance()::class;
|
||||
$prettyName = implode(' > ', Arr::pluck($actions, 'name'));
|
||||
|
||||
@@ -184,6 +188,10 @@ class TestsActions
|
||||
return $this;
|
||||
}
|
||||
|
||||
if ($action && filled($arguments = Arr::last($actions)['arguments'] ?? [])) {
|
||||
$action->mergeArguments($arguments);
|
||||
}
|
||||
|
||||
$livewireClass = $this->instance()::class;
|
||||
$prettyName = implode(' > ', Arr::pluck($actions, 'name'));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user