Port columns_definitions/column_default to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Oct 18, 2017 · efacd3e · efacd3e
1 parent 536caac
commit efacd3e
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 57 deletions.
diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php
@@ -931,11 +931,12 @@ public static function getHtmlForCentralColumnsTableRow(array $row, $row_num, $d
             . Template::get('columns_definitions/column_default')
                 ->render(
                     array(
-                    'columnNumber' => $row_num,
+                    'column_number' => $row_num,
                     'ci' => 3,
                     'ci_offset' => 0,
                     'type_upper' => mb_strtoupper($row['col_type']),
-                    'columnMeta' => $meta
+                    'column_meta' => $meta,
+                    'char_editing' => $GLOBALS['cfg']['CharEditing'],
                     )
                 )
             . '</td>';
@@ -1072,11 +1073,12 @@ public static function getHtmlForCentralColumnsEditTableRow(array $row, $row_num
             . Template::get('columns_definitions/column_default')
                 ->render(
                     array(
-                    'columnNumber' => $row_num,
+                    'column_number' => $row_num,
                     'ci' => 3,
                     'ci_offset' => 0,
                     'type_upper' => mb_strtoupper($row['col_default']),
-                    'columnMeta' => $meta
+                    'column_meta' => $meta,
+                    'char_editing' => $GLOBALS['cfg']['CharEditing'],
                     )
                 )
             . '</td>';
@@ -1321,11 +1323,12 @@ public static function getHtmlForAddNewColumn($db, $total_rows)
             . Template::get('columns_definitions/column_default')
                 ->render(
                     array(
-                    'columnNumber' => 0,
+                    'column_number' => 0,
                     'ci' => 3,
                     'ci_offset' => 0,
                     'type_upper' => '',
-                    'columnMeta' => array()
+                    'column_meta' => array(),
+                    'char_editing' => $GLOBALS['cfg']['CharEditing'],
                     )
                 )
             . '</td>'

diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php
@@ -26,6 +26,7 @@ public function getFunctions()
     {
         return array(
             new Twig_SimpleFunction('array_search', 'array_search'),
+            new Twig_SimpleFunction('bin2hex', 'bin2hex'),
             new Twig_SimpleFunction('md5', 'md5'),
             new Twig_SimpleFunction('preg_replace', 'preg_replace'),
             new Twig_SimpleFunction('strpos', 'strpos'),

diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml
@@ -45,11 +45,12 @@ $ci_offset = -1;
     <!-- column default -->
     <?= PhpMyAdmin\Template::get('columns_definitions/column_default')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
             'type_upper' => isset($type_upper) ? $type_upper : null,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
+            'column_meta' => isset($columnMeta) ? $columnMeta : null,
+            'char_editing' => $GLOBALS['cfg']['CharEditing'],
         )); ?>
 </td>
 <td class="center">

diff --git a/templates/columns_definitions/column_default.phtml b/templates/columns_definitions/column_default.phtml
diff --git a/templates/columns_definitions/column_default.twig b/templates/columns_definitions/column_default.twig
@@ -0,0 +1,46 @@
+{# here we put 'NONE' as the default value of drop-down; otherwise users would
+have problems if they forget to enter the default value (example, for an INT) #}
+{% set translation %}{% trans %}None{% context %}for default{% endtrans %}{% endset %}
+{% set default_options = {
+    'NONE': translation,
+    'USER_DEFINED': 'As defined:'|trans,
+    'NULL': 'NULL',
+    'CURRENT_TIMESTAMP': 'CURRENT_TIMESTAMP'
+} %}
+
+{# For a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value #}
+{% set default_value = '' %}
+{% if column_meta['DefaultValue'] is defined %}
+    {% set default_value = column_meta['DefaultValue'] %}
+{% endif %}
+{% if type_upper == 'BIT' %}
+    {% set default_value = Util_convertBitDefaultValue(column_meta['DefaultValue']) %}
+{% elseif type_upper == 'BINARY' or type_upper == 'VARBINARY' %}
+    {% set default_value = bin2hex(column_meta['DefaultValue']) %}
+{% endif %}
+
+<select name="field_default_type[{{ column_number }}]"
+    id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    class="default_type">
+    {% for key, value in default_options %}
+        <option value="{{ key }}"
+            {%- if column_meta['DefaultType'] is defined
+                and column_meta['DefaultType'] == key %}
+                selected="selected"
+            {%- endif %}>
+            {{ value }}
+        </option>
+    {% endfor %}
+</select>
+{% if char_editing == 'textarea' %}
+    <textarea name="field_default_value[{{ column_number }}]"
+        cols="15"
+        class="textfield
+        default_value">{{ default_value }}</textarea>
+{% else %}
+    <input type="text"
+        name="field_default_value[{{ column_number }}]"
+        size="12"
+        value="{{ default_value }}"
+        class="textfield default_value" />
+{% endif %}