mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-08 09:24:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix exception if uploading a new file for an already existing attachment

Browse source
This commit is contained in:
Jan Böhmer 2023-11-27 22:48:18 +01:00
parent eb30fb6e83
commit 08bd4d54e3
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/Services/Attachments/AttachmentSubmitHandler.php
View file

@ -143,19 +143,35 @@ class AttachmentSubmitHandler
{ {
$base_path = $secure_upload ? $this->pathResolver->getSecurePath() : $this->pathResolver->getMediaPath(); $base_path = $secure_upload ? $this->pathResolver->getSecurePath() : $this->pathResolver->getMediaPath();
//Ensure the given attachment class is known to mapping
if (!isset($this->folder_mapping[$attachment::class])) {
throw new InvalidArgumentException('The given attachment class is not known! The passed class was: '.$attachment::class);
}
//Ensure the attachment has an assigned element //Ensure the attachment has an assigned element
if (!$attachment->getElement() instanceof AttachmentContainingDBElement) { if (!$attachment->getElement() instanceof AttachmentContainingDBElement) {
throw new InvalidArgumentException('The given attachment is not assigned to an element! An element is needed to generate a path!'); throw new InvalidArgumentException('The given attachment is not assigned to an element! An element is needed to generate a path!');
} }
//Determine the folder prefix for the given attachment class:
$prefix = null;
//Check if we can use the class name dire
if (isset($this->folder_mapping[$attachment::class])) {
$prefix = $this->folder_mapping[$attachment::class];
} else {
//If not, check for instance of:
foreach ($this->folder_mapping as $class => $folder) {
if ($attachment instanceof $class) {
$prefix = $folder;
break;
}
}
}
//Ensure the given attachment class is known to mapping
if (!$prefix) {
throw new InvalidArgumentException('The given attachment class is not known! The passed class was: '.$attachment::class);
}
//Build path //Build path
return return
$base_path.DIRECTORY_SEPARATOR //Base path $base_path.DIRECTORY_SEPARATOR //Base path
.$this->folder_mapping[$attachment::class].DIRECTORY_SEPARATOR.$attachment->getElement()->getID(); .$prefix.DIRECTORY_SEPARATOR.$attachment->getElement()->getID();
} }
/** /**