Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
wip
  • Loading branch information
pxpm committed Nov 7, 2024
commit d1ce6d5ec9f0ccb204a722766dfd377645b2faf9
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Laravel", "Backpack", "Backpack for Laravel", "Backpack Addon", "spatie medialibrary uploaders"
],
"require": {
"backpack/crud": "^6.0",
"backpack/crud": "^6.8",
"spatie/laravel-medialibrary": "^10.7|^11.3"
},
"require-dev": {
Expand Down
13 changes: 6 additions & 7 deletions src/Uploaders/MediaUploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ public function retrieveUploadedFiles(Model $entry): Model
if (! is_array($values)) {
$values = json_decode($values, true);
}

$repeatableUploaders = array_merge(app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()), [$this]);
foreach ($repeatableUploaders as $uploader) {
$uploadValues = $uploader->getPreviousRepeatableValues($entry);

$values = $this->mergeValuesRecursive($values, $uploadValues);
}

Expand Down Expand Up @@ -131,7 +131,7 @@ protected function get(HasMedia|Model $entry)
return $media->first();
}

protected function processRepeatableUploads(Model $entry, Collection $values): Collection
protected function processRepeatableUploads(Model $entry, Collection $values): array
{
foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) {
$uploader->uploadRepeatableFiles($values->pluck($uploader->getName())->toArray(), $uploader->getPreviousRepeatableMedia($entry), $entry);
Expand All @@ -140,7 +140,7 @@ protected function processRepeatableUploads(Model $entry, Collection $values): C
unset($item[$uploader->getName()]);

return $item;
});
})->toArray();
}

return $values;
Expand Down Expand Up @@ -207,9 +207,9 @@ protected function getPreviousRepeatableMedia(Model $entry)
$previousMedia = $this->get($entry)->transform(function ($item) {
return [$this->getName() => $item, 'order_column' => $item->getCustomProperty('repeatableRow')];
});
$previousMedia->each(function($item) use (&$orderedMedia) {
$previousMedia->each(function ($item) use (&$orderedMedia) {
$orderedMedia[] = $item[$this->getName()];
});
});

return $orderedMedia;
}
Expand All @@ -236,7 +236,6 @@ private function initFileAdder($entry, $file)
if (get_class($file) === File::class) {
return $entry->addMedia($file->getPathName());
}

}

private function getConversionToDisplay($item)
Expand Down