Port columns_definitions/column_comment to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Oct 9, 2017 · 082927a · 082927a
1 parent 004701c
commit 082927a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml
@@ -123,11 +123,15 @@ $ci_offset = -1;
     <!-- column comments -->
     <?= PhpMyAdmin\Template::get('columns_definitions/column_comment')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null,
-            'comments_map' => $comments_map
+            'max_length' => $GLOBALS['dbi']->getVersion() >= 50503 ? 1024 : 255,
+            'value' => (isset($columnMeta['Field'])
+                && is_array($comments_map)
+                && isset($comments_map[$columnMeta['Field']]))
+                ? htmlspecialchars($comments_map[$columnMeta['Field']])
+                : '',
         )); ?>
 </td>
  <!-- column virtuality -->

diff --git a/templates/columns_definitions/column_comment.phtml b/templates/columns_definitions/column_comment.phtml
diff --git a/templates/columns_definitions/column_comment.twig b/templates/columns_definitions/column_comment.twig
@@ -0,0 +1,7 @@
+<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    type="text"
+    name="field_comments[{{ column_number }}]"
+    size="12"
+    maxlength="{{ max_length }}"
+    value="{{ value }}"
+    class="textfield" />