Links for column search in select

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 768e5fa3f491b0c53bcae1ade037879b8c081a38..3218799b34e8fffc3cbc0c0369f93ea63984ce6f 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -273,10 +273,12 @@ if (!$columns) {
                                        if ($name != "") {
                                                $rank++;
                                                $names[$key] = $name;
-                                               $column = idf_escape($key);
                                                $href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
                                                echo '<th><a href="' . h($href) . '">' . (!$select || $val ? apply_sql_function($val["fun"], $name) : h(current($select))) . "</a>"; //! columns looking like functions
                                                echo "<a href='" . h("$href&desc%5B0%5D=1") . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+                                               if (!$val["fun"]) {
+                                                       echo '<a href="#fieldset-search" onclick="selectSearch(\'' . h(js_escape($key)) . '\'); return false;" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+                                               }
                                        }
                                        $functions[$key] = $val["fun"];
                                        next($select);

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 8dbf4c1880278db3579835f21014e8fd7a2ff919..4f5df70367d803eadbb0fad5cb243a9024a24791 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -262,6 +262,28 @@ function selectFieldChange(form) {
 
 
 
+/** Fill column in search field
+ * @param string
+ */
+function selectSearch(name) {
+       var el = document.getElementById('fieldset-search');
+       el.className = '';
+       var divs = el.getElementsByTagName('div');
+       for (var i=0; i < divs.length; i++) {
+               var div = divs[i];
+               if (selectValue(div.firstChild) == name) {
+                       break;
+               }
+       }
+       if (i == divs.length) {
+               div.firstChild.value = name;
+               div.firstChild.onchange();
+       }
+       div.lastChild.focus();
+}
+
+
+
 /** Send form by Ctrl+Enter on <select> and <textarea>
 * @param KeyboardEvent
 * @param [string]

diff --git a/changes.txt b/changes.txt
index 88618c8c778453b00a4d63757aaf4c25cbf10796..a975d69de0bc8a7efbd75f7529d20b24448c3846 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.4.1-dev:
+Links for column search in select
 Display assigned auto_increment after clone
 SQLite: Full alter table
 SQLite: Better editing in tables without primary key