Clear column name after resetting search (bug #3601200)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index fadc030347229abbf5318039b17d507e04787492..e65f3ad8aca101d88e543a85eeead44395be6744 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -264,7 +264,7 @@ username.form['auth[driver]'].onchange();
                        if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
                                echo "<div><select name='where[$i][col]' onchange='$change_next'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
                                echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
-                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";'></div>\n";
+                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onsearch='selectSearch(this);'></div>\n";
                        }
                }
                echo "</div></fieldset>\n";

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 22064fcbb385a85511cb955aa847e5c079235cd9..f0976c9edcdc566be9df9a8ebc6a3b364966802e 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -255,6 +255,15 @@ function selectAddRow(field) {
        field.parentNode.parentNode.appendChild(row);
 }
 
+/** Clear column name after resetting search
+* @param HTMLInputElement
+*/
+function selectSearch(el) {
+       if (!el.value) {
+               el.parentNode.firstChild.selectedIndex = 0;
+       }
+}
+
 
 
 /** Toggles column context menu

diff --git a/changes.txt b/changes.txt
index 85e1cdaa5c8a5d0702a6a96787683980246e7530..6a0f87819c01093116d5e8d820605afe4fe6218f 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -2,6 +2,7 @@ Adminer 3.6.4-dev:
 Display pagination on a fixed position
 Display SQL edit form on Ctrl+click on the select query
 Recover original view, trigger, routine if creating fails
+Clear column name after resetting search (bug #3601200)
 Allow loading more data with inline edit (bug #3605531)
 Stay on the same page after deleting rows (bug #3605845)
 Handle max_input_vars

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index b2e9235de3032ff7758d6c4dca3208f0da280a53..9acc08dc1e6991147d2849ba641bc979d9e7d28a 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -235,13 +235,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                        if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
                                echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
                                echo html_select("where[$i][op]", array(-1 => "") + $this->operators, $val["op"]);
-                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'></div>\n";
+                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onsearch='selectSearch(this);'></div>\n";
                                $i++;
                        }
                }
                echo "<div><select name='where[$i][col]' onchange='this.nextSibling.nextSibling.onchange();'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, null, true) . "</select>";
                echo html_select("where[$i][op]", array(-1 => "") + $this->operators);
-               echo "<input type='search' name='where[$i][val]' onchange='selectAddRow(this);'></div>\n";
+               echo "<input type='search' name='where[$i][val]' onchange='selectAddRow(this);' onsearch='selectSearch(this);'></div>\n";
                echo "</div></fieldset>\n";
        }