Skip to content

Commit 824c3d1

Browse files
committed
Merge branch 'feature/delete_files'
2 parents 646d75c + 597b87a commit 824c3d1

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

config/app_assets.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
'assetsDir' => 'resources' . DS . 'assets' . DS,
1616
'displayField' => 'title',
1717
'Behaviors' => [],
18+
'deleteFile' => false,
1819
],
1920
'ImageAsset' => [
2021
// driver can be 'imagick' or 'gd'

src/Model/Table/AssetsTable.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Assets\Model\Table;
55

6+
use ArrayObject;
67
use Cake\Core\Configure;
78
use Cake\Datasource\EntityInterface;
89
use Cake\Event\EventInterface;
@@ -11,6 +12,7 @@
1112
use Cake\ORM\Table;
1213
use Cake\Validation\Validator;
1314
use Laminas\Diactoros\UploadedFile;
15+
use Nette\Utils\FileSystem;
1416

1517
/**
1618
* Assets Model
@@ -124,11 +126,18 @@ public function validationDefault(Validator $validator): Validator
124126
* @param \ArrayObject $options Options passed to the event
125127
* @return \Cake\ORM\Query
126128
*/
127-
public function beforeFind(EventInterface $e, Query $query, \ArrayObject $options)
129+
public function beforeFind(EventInterface $e, Query $query, ArrayObject $options)
128130
{
129131
return $query->orderDesc('modified');
130132
}
131133

134+
public function afterDelete(EventInterface $e, EntityInterface $entity, ArrayObject $options)
135+
{
136+
if (Configure::read('AssetsPlugin.AssetsTable.deleteFile') === true) {
137+
FileSystem::delete(ROOT . DS . $entity->directory . $entity->filename);
138+
}
139+
}
140+
132141
/**
133142
* @return string
134143
*/

0 commit comments

Comments
 (0)