Fix not being able to delete images

Fixes #431
This commit is contained in:
rijkvanzanten
2020-09-29 11:06:27 -04:00
parent f22a796593
commit 3973ad398f
2 changed files with 13 additions and 8 deletions

View File

@@ -91,12 +91,14 @@ export class FilesService extends ItemsService {
delete(keys: PrimaryKey[]): Promise<PrimaryKey[]>;
async delete(key: PrimaryKey | PrimaryKey[]): Promise<PrimaryKey | PrimaryKey[]> {
const keys = Array.isArray(key) ? key : [key];
const files = await super.readByKey(keys, { fields: ['id', 'storage'] });
let files = await super.readByKey(keys, { fields: ['id', 'storage'] });
if (!files) {
throw new ItemNotFoundException(key, 'directus_files');
}
files = Array.isArray(files) ? files : [files];
for (const file of files) {
const disk = storage.disk(file.storage);

View File

@@ -279,13 +279,16 @@ export default defineComponent({
const batchPrimaryKeys = selection.value;
await api.delete(`/files/${batchPrimaryKeys}`);
await layoutRef.value?.refresh();
selection.value = [];
deleting.value = false;
confirmDelete.value = false;
try {
await api.delete(`/files/${batchPrimaryKeys}`);
confirmDelete.value = false;
selection.value = [];
await layoutRef.value?.refresh();
} catch (err) {
console.error(err);
} finally {
deleting.value = false;
}
}
}