viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

attachment fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-07-09 14:17:24 +03:00
parent a5609f3cad
commit ecdcab7371
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/Espo/Repositories/Attachment.php
View File

@@ -29,6 +29,8 @@
namespace Espo\Repositories;
use Espo\Core\Exceptions\Error;
use Espo\ORM\Entity;
use Espo\Core\Utils\Util;
@@ -62,16 +64,6 @@ class Attachment extends \Espo\Core\Repositories\Database implements
'xx-large',
];
protected function getFileManager()
{
return $this->fileManager;
}
protected function getFileStorageManager()
{
return $this->fileStorageManager;
}
public function beforeSave(Entity $entity, array $options = [])
{
parent::beforeSave($entity, $options);
@@ -95,11 +87,11 @@ class Attachment extends \Espo\Core\Repositories\Database implements
if ($isNew) {
$entity->id = Util::generateId();
if (!empty($entity->id) && $entity->has('contents')) {
if ($entity->has('contents')) {
$contents = $entity->get('contents');
$storeResult = $this->getFileStorageManager()->putContents($entity, $contents);
$storeResult = $this->fileStorageManager->putContents($entity, $contents);
if ($storeResult === false) {
throw new \Espo\Core\Exceptions\Error("Could not store the file");
throw new Error("Could not store the file");
}
}
}
@@ -125,7 +117,7 @@ class Attachment extends \Espo\Core\Repositories\Database implements
])->count();
if ($duplicateCount === 0) {
$this->getFileStorageManager()->unlink($entity);
$this->fileStorageManager->unlink($entity);
if (in_array($entity->get('type'), $this->imageTypeList)) {
$this->removeImageThumbs($entity);
@@ -137,8 +129,8 @@ class Attachment extends \Espo\Core\Repositories\Database implements
{
foreach ($this->imageThumbList as $suffix) {
$filePath = "data/upload/thumbs/".$entity->getSourceId()."_{$suffix}";
if ($this->getFileManager()->isFile($filePath)) {
$this->getFileManager()->removeFile($filePath);
if ($this->fileManager->isFile($filePath)) {
$this->fileManager->removeFile($filePath);
}
}
}
@@ -166,21 +158,21 @@ class Attachment extends \Espo\Core\Repositories\Database implements
public function getContents(Entity $entity)
{
return $this->getFileStorageManager()->getContents($entity);
return $this->fileStorageManager->getContents($entity);
}
public function getFilePath(Entity $entity)
{
return $this->getFileStorageManager()->getLocalFilePath($entity);
return $this->fileStorageManager->getLocalFilePath($entity);
}
public function hasDownloadUrl(Entity $entity)
{
return $this->getFileStorageManager()->hasDownloadUrl($entity);
return $this->fileStorageManager->hasDownloadUrl($entity);
}
public function getDownloadUrl(Entity $entity)
{
return $this->getFileStorageManager()->getDownloadUrl($entity);
return $this->fileStorageManager->getDownloadUrl($entity);
}
}

5
application/Espo/Services/Attachment.php
View File

@@ -79,7 +79,7 @@ class Attachment extends Record
}
}
protected function beforeCreateEntity(Entity $entity, $data)
protected function handleCreateInput($data)
{
if (!empty($data->file)) {
$arr = explode(',', $data->file);
@@ -140,7 +140,10 @@ class Attachment extends Record
throw new BadRequest("Not supported attachment role.");
}
}
}
protected function beforeCreateEntity(Entity $entity, $data)
{
$storage = $entity->get('storage');
if ($storage && !$this->getMetadata()->get(['app', 'fileStorage', 'implementationClassNameMap', $storage])) {
$entity->clear('storage');

8
application/Espo/Services/Record.php
View File

@@ -911,6 +911,10 @@ class Record implements Crud,
{
}
protected function handleCreateInput($data)
{
}
protected function handleInput($data)
{
}
@@ -987,9 +991,11 @@ class Record implements Crud,
$entity = $this->getRepository()->get();
$this->handleInput($data);
$this->handleCreateInput($data);
$this->filterInput($data);
$this->filterCreateInput($data);
$this->handleInput($data);
unset($data->id);
unset($data->modifiedById);