Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jul 23, 2020 · 47c70da · 47c70da
2 parents 7331688 + a2fb692
commit 47c70da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -89,6 +89,7 @@ phpMyAdmin - ChangeLog
 - issue #16261 Fix missing headings on modals of "User Accounts -> Export"
 - issue #16146 Fixed sorting did not keep the selector of number of rows
 - issue #16194 Fixed SQL query does not appear in case of editing view where definer is not you on MySQL 8
+- issue #16255 Fix tinyint(1) shown as INT on Search page
 
 5.0.2 (2020-03-20)
 - issue        Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page

diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
@@ -389,7 +389,6 @@ public function getColumnProperties($search_index, $column_index)
             );
             $htmlAttributes = 'data-min="' . $minMaxValues[0] . '" '
                             . 'data-max="' . $minMaxValues[1] . '"';
-            $type = 'INT';
         }
 
         $htmlAttributes .= ' onchange="return '
@@ -398,6 +397,7 @@ public function getColumnProperties($search_index, $column_index)
         $value = $this->template->render('table/search/input_box', [
             'str' => '',
             'column_type' => (string) $type,
+            'column_data_type' => strtoupper($cleanType),
             'html_attributes' => $htmlAttributes,
             'column_id' => 'fieldID_',
             'in_zoom_search_edit' => false,

diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -464,7 +464,6 @@ public function getColumnProperties($search_index, $column_index)
             );
             $htmlAttributes = 'data-min="' . $minMaxValues[0] . '" '
                             . 'data-max="' . $minMaxValues[1] . '"';
-            $type = 'INT';
         }
 
         $htmlAttributes .= ' onchange="return '
@@ -473,6 +472,7 @@ public function getColumnProperties($search_index, $column_index)
         $value = $this->template->render('table/search/input_box', [
             'str' => '',
             'column_type' => (string) $type,
+            'column_data_type' => strtoupper($cleanType),
             'html_attributes' => $htmlAttributes,
             'column_id' => 'fieldID_',
             'in_zoom_search_edit' => false,

diff --git a/templates/table/search/input_box.twig b/templates/table/search/input_box.twig
@@ -87,7 +87,7 @@
     {% endif %}
     <input type="text"
         name="criteriaValues[{{ column_index }}]"
-        data-type="{{ column_type }}"
+        data-type="{{ column_data_type }}"
         {{ html_attributes|raw }}
         size="40"
         class="{{ the_class }}"