Display search fields in order
This commit is contained in:
parent
9d944c8fc1
commit
3a333e92ff
|
@ -288,6 +288,8 @@ $translations = array(
|
||||||
// hint for time format - use language equivalents for hour, minute and second shortcuts
|
// hint for time format - use language equivalents for hour, minute and second shortcuts
|
||||||
'HH:MM:SS' => 'HH:MM:SS',
|
'HH:MM:SS' => 'HH:MM:SS',
|
||||||
'now' => 'teď',
|
'now' => 'teď',
|
||||||
|
'yes' => 'ano',
|
||||||
|
'no' => 'ne',
|
||||||
|
|
||||||
// general SQLite error in create, drop or rename database
|
// general SQLite error in create, drop or rename database
|
||||||
'File exists.' => 'Soubor existuje.',
|
'File exists.' => 'Soubor existuje.',
|
||||||
|
|
|
@ -163,7 +163,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (like_bool($field) && $return != " ") { // bool
|
if (like_bool($field) && $return != " ") { // bool
|
||||||
$return = '<img src="' . ($val ? "../adminer/static/plus.gif" : "../adminer/static/cross.gif") . '" alt="' . h($val) . '">';
|
$return = ($val ? lang('yes') : lang('no'));
|
||||||
}
|
}
|
||||||
if ($link) {
|
if ($link) {
|
||||||
$return = "<a href='$link'>$return</a>";
|
$return = "<a href='$link'>$return</a>";
|
||||||
|
@ -196,20 +196,16 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
}
|
}
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$fields = fields($_GET["select"]);
|
$fields = fields($_GET["select"]);
|
||||||
foreach ($fields as $name => $field) {
|
foreach ($columns as $name => $desc) {
|
||||||
$desc = $columns[$name];
|
$field = $fields[$name];
|
||||||
if (ereg("enum", $field["type"]) && $desc != "") { //! set - uses 1 << $i and FIND_IN_SET()
|
if (ereg("enum", $field["type"])) { //! set - uses 1 << $i and FIND_IN_SET()
|
||||||
$key = $keys[$name];
|
$key = $keys[$name];
|
||||||
$i--;
|
$i--;
|
||||||
echo "<div>" . h($desc) . "<input type='hidden' name='where[$i][col]' value='" . h($name) . "'>:";
|
echo "<div>" . h($desc) . "<input type='hidden' name='where[$i][col]' value='" . h($name) . "'>:";
|
||||||
echo enum_input("checkbox", " name='where[$i][val][]'", $field, (array) $where[$key]["val"], ($field["null"] ? 0 : null));
|
echo enum_input("checkbox", " name='where[$i][val][]'", $field, (array) $where[$key]["val"], ($field["null"] ? 0 : null));
|
||||||
echo "</div>\n";
|
echo "</div>\n";
|
||||||
unset($columns[$name]);
|
unset($columns[$name]);
|
||||||
}
|
} elseif (is_array($options = $this->_foreignKeyOptions($_GET["select"], $name))) {
|
||||||
}
|
|
||||||
foreach ($columns as $name => $desc) {
|
|
||||||
$options = $this->_foreignKeyOptions($_GET["select"], $name);
|
|
||||||
if (is_array($options)) {
|
|
||||||
if ($fields[$name]["null"]) {
|
if ($fields[$name]["null"]) {
|
||||||
$options[0] = '(' . lang('empty') . ')';
|
$options[0] = '(' . lang('empty') . ')';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue