From 02b722c8ab2f9f7671a97474c53637d2b31ee46e Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 5 Mar 2019 00:42:28 +0200
Subject: [PATCH] Minor cleanup on file field

---
 .../grav/templates/forms/fields/file/file.html.twig   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/themes/grav/templates/forms/fields/file/file.html.twig b/themes/grav/templates/forms/fields/file/file.html.twig
index f16e1a9e..0ab0e8bb 100644
--- a/themes/grav/templates/forms/fields/file/file.html.twig
+++ b/themes/grav/templates/forms/fields/file/file.html.twig
@@ -37,7 +37,7 @@
         {% set blueprint = base64_encode(blueprint_name) %}
         {% set real_path = value.thumb ?? global.context.media[path].relativePath ?? global.form.getPagePathFromToken(path) ?? global.admin.getPagePathFromToken(path) %}
 
-        {% set remove = remove ?: uri.addNonce(
+        {% set remove = global.file_task_remove ? global.file_url_remove : uri.addNonce(
             global.file_url_remove ~
             '/media.json' ~
             '/route' ~ config.system.param_sep ~ base64_encode(global.base_path ~ '/' ~ real_path) ~
@@ -80,12 +80,15 @@
     <div class="{{ form_field_wrapper_classes ?: 'form-input-wrapper' }} {{ field.classes }} dropzone files-upload {% if field.fancy is not same as(false) %}form-input-file{% endif %} {{ field.size }}"
          data-grav-file-settings="{{ settings|json_encode|e('html_attr') }}"
          data-dropzone-options="{{ dropzoneSettings|json_encode|e('html_attr') }}"
-         {% if file_task_add %}
+         {% if file_task_add and file_task_remove %}
              data-file-post-add="{{ file_task_add|json_encode|e('html_attr') }}"
              data-file-post-remove="{{ file_task_remove|json_encode|e('html_attr') }}"
+             data-file-url-add="{{ file_url_add }}"
+             data-file-url-remove="{{ file_url_remove }}"
+         {% else %}
+             {% if file_url_add %}data-file-url-add="{{ file_url_add }}"{% endif %}
+             {% if file_url_remove %}data-file-url-remove="{{ file_url_remove }}"{% endif %}
          {% endif %}
-         {% if file_url_add %}data-file-url-add="{{ file_url_add }}"{% endif %}
-         {% if file_url_remove %}data-file-url-remove="{{ file_url_remove }}"{% endif %}
     >
 
     {% block file_extras %}{% endblock %}