From 8ca95dd31f2106f60b4041e5d35b30d7f5c64d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 17 Sep 2020 18:36:46 -0300
Subject: [PATCH] Remove columns_definitions/mime_type template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 .../column_attributes.twig                    | 23 +++++++++++--------
 templates/columns_definitions/mime_type.twig  | 17 --------------
 2 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 templates/columns_definitions/mime_type.twig

diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index 93ac281d29..f651569b1a 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -185,16 +185,19 @@
 
 {% if cfg_relation['mimework'] and browse_mime and cfg_relation['commwork'] %}
     <td class="text-center">
-        {# Column Mime-type #}
-        {% include 'columns_definitions/mime_type.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta,
-            'available_mime': available_mime,
-            'mime_map': mime_map
-        } only %}
-        {% set ci = ci + 1 %}
+      <select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_mimetype[{{ column_number }}]">
+        <option value="">&nbsp;</option>
+        {% if available_mime['mimetype'] is defined and available_mime['mimetype'] is iterable %}
+          {% for media_type in available_mime['mimetype'] %}
+            <option value="{{ media_type|replace({'/': '_'}) }}"
+              {{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['mimetype'] is defined
+                and mime_map[column_meta['Field']]['mimetype'] == media_type|replace({'/': '_'}) ? ' selected' }}>
+              {{ media_type|lower }}
+            </option>
+          {% endfor %}
+        {% endif %}
+      </select>
+      {% set ci = ci + 1 %}
     </td>
     <td class="text-center">
       <select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_transformation[{{ column_number }}]">
diff --git a/templates/columns_definitions/mime_type.twig b/templates/columns_definitions/mime_type.twig
deleted file mode 100644
index ef395b65d8..0000000000
--- a/templates/columns_definitions/mime_type.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-<select id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    size="1"
-    name="field_mimetype[{{ column_number }}]">
-    <option value="">&nbsp;</option>
-    {% if available_mime['mimetype'] is defined
-        and available_mime['mimetype'] is iterable %}
-        {% for mimetype in available_mime['mimetype'] %}
-            {% set checked = column_meta['Field'] is defined
-                and mime_map[column_meta['Field']]['mimetype'] is defined
-                and mime_map[column_meta['Field']]['mimetype'] == mimetype|replace({'/': '_'})
-                ? ' selected' %}
-            <option value="{{ mimetype|replace({'/': '_'}) }}"{{ checked }}>
-                {{ mimetype|lower }}
-            </option>
-        {% endfor %}
-    {% endif %}
-</select>