From e3e4c14a3d8a5610acd587b71557834264e16fc0 Mon Sep 17 00:00:00 2001 From: Adam Faulkner Date: Tue, 22 Aug 2023 12:09:19 +0100 Subject: [PATCH 1/2] use laravel's asset helper as opposed to url --- src/Admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Admin.php b/src/Admin.php index 6bdacbb7..d1a8c400 100644 --- a/src/Admin.php +++ b/src/Admin.php @@ -418,7 +418,7 @@ protected function fireBootedCallbacks() public static function asset($asset) { - return url('/vendor/open-admin/'.$asset); + return admin_asset('/vendor/open-admin/'.$asset); } public static function js_trans() From 4e767447bf8d1ac7cfcaa96df6df94c97cd3d992 Mon Sep 17 00:00:00 2001 From: Pele <870628+odiaseo@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:39:48 +0000 Subject: [PATCH 2/2] Fix row action model --- src/Form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Form.php b/src/Form.php index f61e7990..cf8e7636 100644 --- a/src/Form.php +++ b/src/Form.php @@ -185,6 +185,10 @@ public function pushField(Field $field): self */ public function model(): Model { + if ($this->model instanceof Actions\Interactor\Form) { + return $this->model->getRow(); + } + return $this->model; }