Clear column name after resetting search (bug #3601200)
This commit is contained in:
parent
1a1b800b40
commit
3093f58157
|
@ -264,7 +264,7 @@ username.form['auth[driver]'].onchange();
|
||||||
if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
|
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 "<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 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";
|
echo "</div></fieldset>\n";
|
||||||
|
|
|
@ -255,6 +255,15 @@ function selectAddRow(field) {
|
||||||
field.parentNode.parentNode.appendChild(row);
|
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
|
/** Toggles column context menu
|
||||||
|
|
|
@ -2,6 +2,7 @@ Adminer 3.6.4-dev:
|
||||||
Display pagination on a fixed position
|
Display pagination on a fixed position
|
||||||
Display SQL edit form on Ctrl+click on the select query
|
Display SQL edit form on Ctrl+click on the select query
|
||||||
Recover original view, trigger, routine if creating fails
|
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)
|
Allow loading more data with inline edit (bug #3605531)
|
||||||
Stay on the same page after deleting rows (bug #3605845)
|
Stay on the same page after deleting rows (bug #3605845)
|
||||||
Handle max_input_vars
|
Handle max_input_vars
|
||||||
|
|
|
@ -235,13 +235,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
|
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 "<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 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++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "<div><select name='where[$i][col]' onchange='this.nextSibling.nextSibling.onchange();'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, null, true) . "</select>";
|
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 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";
|
echo "</div></fieldset>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue