From 9d8e066e5c7fd4f224718c8f4c85dbf5fdcc0f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 13 Sep 2020 12:25:16 -0300
Subject: [PATCH] Remove columns_definitions/column_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                    | 14 +++++-------
 .../columns_definitions/column_type.twig      |  8 -------
 .../central_columns/edit_table_row.twig       | 10 +++------
 templates/database/central_columns/main.twig  | 22 ++++++-------------
 4 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 templates/columns_definitions/column_type.twig

diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index 3f70d3bcbc..ae57f9e901 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -18,15 +18,11 @@
     {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column type #}
-    {% include 'columns_definitions/column_type.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta,
-        'type_upper': type_upper
-    } only %}
-    {% set ci = ci + 1 %}
+  <select class="column_type" name="field_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    {{- column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] ? ' disabled' }}>
+    {{ get_supported_datatypes(true, type_upper) }}
+  </select>
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
     {# column length #}
diff --git a/templates/columns_definitions/column_type.twig b/templates/columns_definitions/column_type.twig
deleted file mode 100644
index e74eb0e135..0000000000
--- a/templates/columns_definitions/column_type.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<select class="column_type"
-    name="field_type[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {%- if column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] -%}
-    disabled="disabled"
-    {%- endif %}>
-    {{ get_supported_datatypes(true, type_upper) }}
-</select>
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index 9dc337f8cf..9a79281456 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -12,13 +12,9 @@
   </td>
 
   <td name="col_type" class="nowrap">
-    {% include 'columns_definitions/column_type.twig' with {
-      'column_number': row_num,
-      'ci': 1,
-      'ci_offset': 0,
-      'column_meta': [],
-      'type_upper': row['col_type']|upper
-    } only %}
+    <select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
+      {{ get_supported_datatypes(true, row['col_type']|upper) }}
+    </select>
   </td>
 
   <td class="nowrap" name="col_length">
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index e64fac8bc0..2670eff8de 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -63,13 +63,9 @@
                             } only %}
                         </td>
                         <td name="col_type" class="nowrap">
-                            {% include 'columns_definitions/column_type.twig' with {
-                                'column_number': 0,
-                                'ci': 1,
-                                'ci_offset': 0,
-                                'type_upper': '',
-                                'column_meta': {}
-                            } only %}
+                          <select class="column_type" name="field_type[0]" id="field_0_1">
+                            {{ get_supported_datatypes(true) }}
+                          </select>
                         </td>
                         <td class="nowrap" name="col_length">
                             {% include 'columns_definitions/column_length.twig' with {
@@ -299,14 +295,10 @@
                                 } only %}
                             </td>
                             <td name = "col_type" class="nowrap">
-                                <span>{{ row['col_type'] }}</span>
-                                {% include 'columns_definitions/column_type.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 1,
-                                    'ci_offset': 0,
-                                    'type_upper': types_upper[row_num],
-                                    'column_meta': {}
-                                } only %}
+                              <span>{{ row['col_type'] }}</span>
+                              <select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
+                                {{ get_supported_datatypes(true, types_upper[row_num]) }}
+                              </select>
                             </td>
                             <td class="nowrap" name="col_length">
                                 <span>{{ (row['col_length']?(row['col_length']):'') }}</span>