From dc2774cc7fad0807ed1de97364047ebbf8b84525 Mon Sep 17 00:00:00 2001 From: Simon Barrett <57679318+SimonBarrettACT@users.noreply.github.com> Date: Thu, 24 Sep 2020 13:06:05 +0100 Subject: [PATCH 1/4] Update HasStatus.php Replace array_flatten() with Arr::flatten() --- src/Traits/HasStatus.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Traits/HasStatus.php b/src/Traits/HasStatus.php index c539742..0de505e 100644 --- a/src/Traits/HasStatus.php +++ b/src/Traits/HasStatus.php @@ -3,6 +3,7 @@ namespace DigitalCloud\NovaResourceStatus; use DigitalCloud\NovaResourceStatus\Exceptions\InvalidStatus; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Builder; use DigitalCloud\NovaResourceStatus\Events\StatusUpdated; @@ -49,7 +50,7 @@ public function isValidStatus(string $status, ?string $note = null): bool */ public function latestStatus(...$names): ?Status { - $names = is_array($names) ? array_flatten($names) : func_get_args(); + $names = is_array($names) ? Arr::flatten($names) : func_get_args(); $statuses = $this->relationLoaded('statuses') ? $this->statuses : $this->statuses(); @@ -62,7 +63,7 @@ public function latestStatus(...$names): ?Status public function scopeCurrentStatus(Builder $builder, ...$names) { - $names = is_array($names) ? array_flatten($names) : func_get_args(); + $names = is_array($names) ? Arr::flatten($names) : func_get_args(); $builder ->whereHas( 'statuses', @@ -90,7 +91,7 @@ function (QueryBuilder $query) { **/ public function scopeOtherCurrentStatus(Builder $builder, ...$names) { - $names = is_array($names) ? array_flatten($names) : func_get_args(); + $names = is_array($names) ? Arr::flatten($names) : func_get_args(); $builder ->whereHas( 'statuses', From 9b28c6401c66d17c20d6fbf08836d59acd0b396d Mon Sep 17 00:00:00 2001 From: Simon Barrett <57679318+SimonBarrettACT@users.noreply.github.com> Date: Wed, 4 Nov 2020 18:16:55 +0000 Subject: [PATCH 2/4] Update HasStatus.php Fixed namespace for Composer 2 --- src/Traits/HasStatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Traits/HasStatus.php b/src/Traits/HasStatus.php index 0de505e..1f1aae0 100644 --- a/src/Traits/HasStatus.php +++ b/src/Traits/HasStatus.php @@ -1,6 +1,6 @@ Date: Wed, 4 Nov 2020 18:56:37 +0000 Subject: [PATCH 3/4] Update HasStatus.php Imported class for StatusObserver --- src/Traits/HasStatus.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Traits/HasStatus.php b/src/Traits/HasStatus.php index 1f1aae0..d659ee0 100644 --- a/src/Traits/HasStatus.php +++ b/src/Traits/HasStatus.php @@ -3,6 +3,7 @@ namespace DigitalCloud\NovaResourceStatus\Traits; use DigitalCloud\NovaResourceStatus\Exceptions\InvalidStatus; +use DigitalCloud\NovaResourceStatus\StatusObserver; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Builder; From a90bca1d693589e0e70d62e2a1109f401a7d1592 Mon Sep 17 00:00:00 2001 From: Valeriu Vodnicear Date: Wed, 5 May 2021 22:28:16 +0300 Subject: [PATCH 4/4] resource name in Nova --- src/Fields/Statuses.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Fields/Statuses.php b/src/Fields/Statuses.php index 97fbf94..15e17ec 100644 --- a/src/Fields/Statuses.php +++ b/src/Fields/Statuses.php @@ -42,9 +42,9 @@ class Statuses extends Field { */ public $singularLabel; - public function __construct() + public function __construct($name = 'Status Log') { - parent::__construct('Status Log', 'statuses'); + parent::__construct($name, 'statuses'); $resource = \DigitalCloud\NovaResourceStatus\Resources\Status::class;