Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-07-11 12:17:45 +02:00
commit 6a8e56baa2
3 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ily.li", "name": "ily.li",
"version": "0.4.3", "version": "0.4.4",
"description": "Self-hosted file pusher", "description": "Self-hosted file pusher",
"repository": "git@gitlab.com:ArisuOngaku/ily.li.git", "repository": "git@gitlab.com:ArisuOngaku/ily.li.git",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

View File

@ -97,7 +97,7 @@ export default class FileController extends Controller {
switch (file.storage_type) { switch (file.storage_type) {
case 'local': case 'local':
await this.deleteFile(file); await FileController.deleteFile(file);
break; break;
default: default:
throw new ServerError(`This file cannot be deleted. Deletion protocol for ${file.storage_type} storage type not implemented.`); throw new ServerError(`This file cannot be deleted. Deletion protocol for ${file.storage_type} storage type not implemented.`);

View File

@ -43,6 +43,7 @@
Pending deletion Pending deletion
{% else %} {% else %}
<form action="{{ route('delete-file-frontend', file.slug) }}" method="post"> <form action="{{ route('delete-file-frontend', file.slug) }}" method="post">
{{ macros.csrf(getCSRFToken) }}
<button class="button danger"><i data-feather="trash"></i> Delete</button> <button class="button danger"><i data-feather="trash"></i> Delete</button>
</form> </form>
{% endif %} {% endif %}