Skip to content

Commit d4f7d8a

Browse files
committed
fix label not displaying correctly on index view when using associative types
1 parent 31c0a9d commit d4f7d8a

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/HasInlineMorphToFields.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace DigitalCreative\InlineMorphTo;
44

55
use Illuminate\Database\Eloquent\Relations\Relation;
6+
use Illuminate\Support\Collection;
67
use Laravel\Nova\Http\Requests\NovaRequest;
78
use Laravel\Nova\Nova;
89

@@ -11,9 +12,9 @@ trait HasInlineMorphToFields
1112
/**
1213
* Resolve the index fields.
1314
*
14-
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
15+
* @param NovaRequest $request
1516
*
16-
* @return \Illuminate\Support\Collection
17+
* @return Collection
1718
*/
1819
public function detailFields(NovaRequest $request)
1920
{

src/InlineMorphTo.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace DigitalCreative\InlineMorphTo;
44

5+
use App\Nova\Resource;
56
use Illuminate\Database\Eloquent\Model;
67
use Illuminate\Support\Arr;
78
use Illuminate\Support\Str;
@@ -72,7 +73,7 @@ public function types(array $types): self
7273

7374
});
7475

75-
$this->withMeta([ 'resources' => $types ]);
76+
$this->withMeta([ 'resources' => $types->values() ]);
7677

7778
return $this;
7879

@@ -94,8 +95,8 @@ private function convertToHumanCase(string $resource): string
9495
protected function resolveAttribute($resource, $attribute)
9596
{
9697
/**
97-
* @var null|\Illuminate\Database\Eloquent\Model $relationInstance
98-
* @var \Laravel\Nova\Fields\Field $field
98+
* @var null|Model $relationInstance
99+
* @var Field $field
99100
*/
100101

101102
if ($relationInstance = $resource->$attribute) {
@@ -128,10 +129,10 @@ public function fill(NovaRequest $request, $model)
128129
{
129130

130131
/**
131-
* @var \Illuminate\Database\Eloquent\Model $relatedInstance
132-
* @var \Illuminate\Database\Eloquent\Model $model
133-
* @var \App\Nova\Resource $resource
134-
* @var \Laravel\Nova\Fields\Field $field
132+
* @var Model $relatedInstance
133+
* @var Model $model
134+
* @var Resource $resource
135+
* @var Field $field
135136
*/
136137

137138
$resourceClass = $request->input($this->attribute);

0 commit comments

Comments
 (0)