transfer the HTML content in InsertEdti.php to the value_column_for_o…

…ther_datatype.twig file Signed-off-by: Pedro Henrique F. Pimentel <pedrohfpimentel@gmail.com>
phpmyadmin · Nov 28, 2021 · e2991a3 · e2991a3
1 parent b996e22
commit e2991a3
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 36 deletions.
diff --git a/, b/,
@@ -0,0 +1 @@
+Host = not found: 2(SERVFAIL)
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -822,11 +822,15 @@ private function getValueColumnForOtherDatatypes(
         // HTML5 data-* attribute data-type
         $dataType = $this->dbi->types->getTypeClass($column['True_Type']);
         $fieldsize = $this->getColumnSize($column, $extractedColumnspec['spec_in_brackets']);
-        $htmlOutput = $backupField . "\n";
-        if ($column['is_char'] && ($GLOBALS['cfg']['CharEditing'] === 'textarea' || str_contains($data, "\n"))) {
-            $htmlOutput .= "\n";
+        $htmlOutput = '';
+        $html_input = '';
+        $text_area = '';
+        $default_generated = false;
+
+        $if_is_char = $column['is_char'] && ($GLOBALS['cfg']['CharEditing'] === 'textarea' || str_contains($data, "\n"));
+        if ($if_is_char) {
             $GLOBALS['cfg']['CharEditing'] = $defaultCharEditing;
-            $htmlOutput .= $this->getTextarea(
+            $text_area = $this->getTextarea(
                 $column,
                 $backupField,
                 $columnNameAppendix,
@@ -839,8 +843,9 @@ private function getValueColumnForOtherDatatypes(
                 $dataType,
                 $readOnly
             );
-        } else {
-            $htmlOutput .= $this->getHtmlInput(
+        } 
+        if (!$if_is_char)  {
+            $html_input = $this->getHtmlInput(
                 $column,
                 $columnNameAppendix,
                 $specialChars,
@@ -852,38 +857,20 @@ private function getValueColumnForOtherDatatypes(
                 $dataType,
                 $readOnly
             );
-
-            if (
-                preg_match('/(VIRTUAL|PERSISTENT|GENERATED)/', $column['Extra'])
-                && ! str_contains($column['Extra'], 'DEFAULT_GENERATED')
-            ) {
-                $htmlOutput .= '<input type="hidden" name="virtual'
-                    . $columnNameAppendix . '" value="1">';
-            }
-
-            if ($column['Extra'] === 'auto_increment') {
-                $htmlOutput .= '<input type="hidden" name="auto_increment'
-                    . $columnNameAppendix . '" value="1">';
-            }
-
-            if (substr($column['pma_type'], 0, 9) === 'timestamp') {
-                $htmlOutput .= '<input type="hidden" name="fields_type'
-                    . $columnNameAppendix . '" value="timestamp">';
-            }
-
-            if (substr($column['pma_type'], 0, 4) === 'date') {
-                $type = substr($column['pma_type'], 0, 8) === 'datetime' ? 'datetime' : 'date';
-                $htmlOutput .= '<input type="hidden" name="fields_type'
-                    . $columnNameAppendix . '" value="' . $type . '">';
-            }
-
-            if ($column['True_Type'] === 'bit') {
-                $htmlOutput .= '<input type="hidden" name="fields_type'
-                    . $columnNameAppendix . '" value="bit">';
-            }
+            $default_generated = preg_match('/(VIRTUAL|PERSISTENT|GENERATED)/', $column['Extra'])
+            && ! str_contains($column['Extra'], 'DEFAULT_GENERATED');
         }
 
-        return $htmlOutput;
+        return $this->template->render('table/insert/value_column_for_other_datatype', [
+            'html' => $htmlOutput,
+            'html_input' => $html_input,
+            'backup_field' => $backupField,
+            'is_char' => $if_is_char,
+            'text_area' => $text_area,
+            'columnNameAppendix' => $columnNameAppendix,
+            'default_generated' => $default_generated,
+            'column' => $column,
+        ]);
     }
 
     /**

diff --git a/templates/table/insert/value_column_for_other_datatype.twig b/templates/table/insert/value_column_for_other_datatype.twig
@@ -0,0 +1,27 @@
+{{ backup_field|raw }}
+{% if is_char %}
+
+{{ text_area|raw -}}
+{% else %}
+  {{ html_input|raw }}
+  {% if default_generated %}
+    <input type="hidden" name="virtual{{ columnNameAppendix }}" value="1">
+  {% endif %} 
+  {% if column.Extra == 'auto_increment' %}
+    <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="1">
+  {% endif %}
+  {% if column.pma_type|slice(0, 9) == 'timestamp' %}
+    <input type="hidden" name="fields_type-{{ columnNameAppendix }}" value="timestamp">
+  {% endif %}
+  {% if column.pma_type|slice(0, 4) == 'date' %}
+    {% if column.pma_type|slice(0, 8) == 'datetime' %}
+      <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="datetime">
+    {% else %}
+      <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="date">
+    {% endif %}
+  {% endif %}
+  {% if column.True_Type == 'bit' %}
+    <input type="hidden" name="fields_type{{ columnNameAppendix }}" value="bit">
+  {% endif %}
+  {{- html|raw -}}
+{% endif %}