diff --git a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php index f0845f4c59..f796eab78f 100644 --- a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php +++ b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php @@ -23,9 +23,10 @@ protected function visibleColumns() return collect($requested) ->map(function ($field) use ($columns) { - return $columns->get($field)->visible(true); + return $columns->get($field)?->visible(true); }) ->merge($columns->except($requested)) + ->filter() ->values(); } diff --git a/src/Http/Resources/CP/Taxonomies/ListedTerm.php b/src/Http/Resources/CP/Taxonomies/ListedTerm.php index 9f1a94f07d..c60e6a3ca6 100644 --- a/src/Http/Resources/CP/Taxonomies/ListedTerm.php +++ b/src/Http/Resources/CP/Taxonomies/ListedTerm.php @@ -36,7 +36,7 @@ public function toArray($request) 'private' => $term->private(), $this->merge($this->values([ - 'title' => $term->title(), + 'title' => $term->taxonomy()->title() .' - '. $term->title(), 'slug' => $term->slug(), ])),