Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

7 files changed, 9 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index a9c9ffca9e..0543735951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,9 @@ phpMyAdmin - ChangeLog
 - issue #14773 Fix exporting a raw query is not working
 - issue #16734 Fixed memory limit reached, use SQL COUNT(*) instead of fetch and count results
 - issue #16723 Fixed option to perform ALTER ONLINE is not available on edit of an existing column
+- issue        Add missing CSS style on "Filter" button on monitor results table header
+- issue        Fixed non working "Filter" button on monitor results table header
+- issue #16420 Fixed single clicking on row starts editing even if GridEditing is set to double-click
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type
diff --git a/js/src/makegrid.js b/js/src/makegrid.js
index 20cf36df11..4192385e44 100644
--- a/js/src/makegrid.js
+++ b/js/src/makegrid.js
@@ -2058,13 +2058,6 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
                             // start grid-editing
                             startGridEditing(e, this);
                         }
-                    } else {// If it is not a link or it is a double tap then call startGridEditing
-                        // this is a double click, cancel the single click timer
-                        // and make the click count 0
-                        clearTimeout($cell.data('timer'));
-                        $cell.data('clicks', 0);
-                        // start grid-editing
-                        startGridEditing(e, this);
                     }
                 })
                 .on('dblclick', function (e) {
diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js
index a490b6a5e2..ff3a00c650 100644
--- a/js/src/server/status/monitor.js
+++ b/js/src/server/status/monitor.js
@@ -1720,9 +1720,9 @@ AJAX.registerOnload('server/status/monitor.js', function () {
                         '    <legend>' + Messages.strFiltersForLogTable + '</legend>' +
                         '    <div class="formelement">' +
                         '        <label for="filterQueryText">' + Messages.strFilterByWordRegexp + '</label>' +
-                        '        <input name="filterQueryText" type="text" id="filter_query_text">' +
+                        '        <input name="filterQueryText" type="text" id="filterQueryText">' +
                         '    </div>' +
-                        ((logData.numRows > 250) ? ' <div class="formelement"><button name="startFilterQueryText" id="startFilterQueryText">' + Messages.strFilter + '</button></div>' : '') +
+                        ((logData.numRows > 250) ? ' <div class="formelement"><button class="btn btn-secondary" name="startFilterQueryText" id="startFilterQueryText">' + Messages.strFilter + '</button></div>' : '') +
                         '    <div class="formelement">' +
                         '       <input type="checkbox" id="noWHEREData" name="noWHEREData" value="1"> ' +
                         '       <label for="noWHEREData"> ' + Messages.strIgnoreWhereAndGroup + '</label>' +
diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss
index 185b7a6562..5cedf1a5aa 100644
--- a/themes/bootstrap/scss/_common.scss
+++ b/themes/bootstrap/scss/_common.scss
@@ -3055,7 +3055,7 @@ body .ui-dialog {
   pointer-events: none;
 }
 
-#filter_query_text {
+#filterQueryText {
   vertical-align: baseline;
 }
 
diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
index 56656adbeb..457a36a226 100644
--- a/themes/metro/scss/_common.scss
+++ b/themes/metro/scss/_common.scss
@@ -3222,7 +3222,7 @@ body {
   pointer-events: none;
 }
 
-#filter_query_text {
+#filterQueryText {
   vertical-align: baseline;
 }
 
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index b974dfa424..3782163b1c 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -3080,7 +3080,7 @@ body {
   pointer-events: none;
 }
 
-#filter_query_text {
+#filterQueryText {
   vertical-align: baseline;
 }
 
diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
index ef1c924b47..2740587c10 100644
--- a/themes/pmahomme/scss/_common.scss
+++ b/themes/pmahomme/scss/_common.scss
@@ -3248,7 +3248,7 @@ body .ui-dialog {
   pointer-events: none;
 }
 
-#filter_query_text {
+#filterQueryText {
   vertical-align: baseline;
 }