Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
],
"require": {
"php": ">=7.4",
"laravel/framework": "^8.0|^9.0|^10.0|^11.0",
"laravel/nova": "^4.0",
"laravel/framework": "^8.0|^9.0|^10.0|^11.0|^12.0",
"laravel/nova": "^5.0",
"spatie/laravel-medialibrary": "^8.0|^9.0|^10.0|^11.0"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions src/Fields/HandlesCustomPropertiesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ private function fillMediaCustomPropertiesFromRequest(NovaRequest $request, Medi
// If we are dealing with nested resources or multiple panels, custom property fields are prefixed.
$key = str_replace($collection, '__media-custom-properties__.'.$collection, $requestAttribute);
$targetAttribute = "custom_properties->{$field->attribute}";
$requestAttribute = "{$key}.{$index}.{$field->attribute}";
$targetRequestAttribute = "{$key}.{$index}.{$field->attribute}";

$field->fillInto($request, $media, $targetAttribute, $requestAttribute);
$field->fillInto($request, $media, $targetAttribute, $targetRequestAttribute);
}

$media->save();
Expand Down
2 changes: 1 addition & 1 deletion src/Fields/Media.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ private function removeDeletedMedia($data, Collection $medias): Collection
* @param HasMedia|InteractsWithMedia $resource
* @param null $attribute
*/
public function resolve($resource, $attribute = null): void
public function resolve($resource, ?string $attribute = null): void
{
$collectionName = $attribute ?? $this->attribute;

Expand Down