Respect order after search (Editor)
This commit is contained in:
parent
5586c51d18
commit
0bf40f9c70
|
@ -14,6 +14,7 @@ Disable maxlength with functions in edit
|
||||||
Better placement of AJAX icon
|
Better placement of AJAX icon
|
||||||
Table header in CSV export (Editor)
|
Table header in CSV export (Editor)
|
||||||
Time format hint (Editor)
|
Time format hint (Editor)
|
||||||
|
Respect order after search (Editor)
|
||||||
Polish translation
|
Polish translation
|
||||||
|
|
||||||
Adminer 3.2.0 (released 2011-02-24):
|
Adminer 3.2.0 (released 2011-02-24):
|
||||||
|
|
|
@ -250,9 +250,15 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
}
|
}
|
||||||
if ($orders) {
|
if ($orders) {
|
||||||
echo '<fieldset><legend>' . lang('Sort') . "</legend><div>";
|
echo '<fieldset><legend>' . lang('Sort') . "</legend><div>";
|
||||||
echo "<select name='index_order'>" . optionlist(array("" => "") + $orders, $_GET["index_order"], true) . "</select>";
|
echo "<select name='index_order'>" . optionlist(array("" => "") + $orders, ($_GET["order"][0] != "" ? "" : $_GET["index_order"]), true) . "</select>";
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
}
|
}
|
||||||
|
if ($_GET["order"]) {
|
||||||
|
echo "<div style='display: none;'>" . hidden_fields(array(
|
||||||
|
"order" => array(1 => reset($_GET["order"])),
|
||||||
|
"desc" => ($_GET["desc"] ? array(1 => 1) : array()),
|
||||||
|
)) . "</div>\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectLimitPrint($limit) {
|
function selectLimitPrint($limit) {
|
||||||
|
@ -322,10 +328,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectOrderProcess($fields, $indexes) {
|
function selectOrderProcess($fields, $indexes) {
|
||||||
if ($_GET["order"]) {
|
|
||||||
return array(idf_escape($_GET["order"][0]) . (isset($_GET["desc"][0]) ? " DESC" : ""));
|
|
||||||
}
|
|
||||||
$index_order = $_GET["index_order"];
|
$index_order = $_GET["index_order"];
|
||||||
|
if ($index_order != "") {
|
||||||
|
unset($_GET["order"][1]);
|
||||||
|
}
|
||||||
|
if ($_GET["order"]) {
|
||||||
|
return array(idf_escape(reset($_GET["order"])) . ($_GET["desc"] ? " DESC" : ""));
|
||||||
|
}
|
||||||
foreach (($index_order != "" ? array($indexes[$index_order]) : $indexes) as $index) {
|
foreach (($index_order != "" ? array($indexes[$index_order]) : $indexes) as $index) {
|
||||||
if ($index_order != "" || $index["type"] == "INDEX") {
|
if ($index_order != "" || $index["type"] == "INDEX") {
|
||||||
$desc = false;
|
$desc = false;
|
||||||
|
|
Loading…
Reference in a new issue