Editor: Display field comment's text inside [] only in edit form
This commit is contained in:
parent
75c0786d2e
commit
7bcba262df
|
@ -626,6 +626,16 @@ focus(document.getElementById('username'));
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Get hint for edit field
|
||||||
|
* @param string table name
|
||||||
|
* @param array single field from fields()
|
||||||
|
* @param string
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function editHint($table, $field, $value) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
/** Process sent input
|
/** Process sent input
|
||||||
* @param array single field from fields()
|
* @param array single field from fields()
|
||||||
* @param string
|
* @param string
|
||||||
|
|
|
@ -920,6 +920,7 @@ function input($field, $value, $function) {
|
||||||
. "$attrs>"
|
. "$attrs>"
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
echo $adminer->editHint($_GET["edit"], $field, $value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ Adminer 4.3.2-dev:
|
||||||
MySQL: Remove dedicated view for replication status (added in 4.3.0)
|
MySQL: Remove dedicated view for replication status (added in 4.3.0)
|
||||||
PostgreSQL: Sort table names (regression from 4.3.1)
|
PostgreSQL: Sort table names (regression from 4.3.1)
|
||||||
Editor: Don't set time zone from PHP, fixes DST
|
Editor: Don't set time zone from PHP, fixes DST
|
||||||
|
Editor: Display field comment's text inside [] only in edit form
|
||||||
Hebrew translation
|
Hebrew translation
|
||||||
|
|
||||||
Adminer 4.3.1 (released 2017-04-14):
|
Adminer 4.3.1 (released 2017-04-14):
|
||||||
|
|
|
@ -75,7 +75,7 @@ focus(document.getElementById('username'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function fieldName($field, $order = 0) {
|
function fieldName($field, $order = 0) {
|
||||||
return h($field["comment"] != "" ? $field["comment"] : $field["field"]);
|
return h(preg_replace('~\s+\[.*\]$~', '', ($field["comment"] != "" ? $field["comment"] : $field["field"])));
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectLinks($tableStatus, $set = "") {
|
function selectLinks($tableStatus, $set = "") {
|
||||||
|
@ -479,6 +479,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function editHint($table, $field, $value) {
|
||||||
|
return (preg_match('~\s+(\[.*\])$~', ($field["comment"] != "" ? $field["comment"] : $field["field"]), $match) ? h(" $match[1]") : '');
|
||||||
|
}
|
||||||
|
|
||||||
function processInput($field, $value, $function = "") {
|
function processInput($field, $value, $function = "") {
|
||||||
if ($function == "now") {
|
if ($function == "now") {
|
||||||
return "$function()";
|
return "$function()";
|
||||||
|
|
|
@ -307,6 +307,11 @@ class AdminerPlugin extends Adminer {
|
||||||
return $this->_applyPlugin(__FUNCTION__, $args);
|
return $this->_applyPlugin(__FUNCTION__, $args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function editHint($table, $field, $value) {
|
||||||
|
$args = func_get_args();
|
||||||
|
return $this->_applyPlugin(__FUNCTION__, $args);
|
||||||
|
}
|
||||||
|
|
||||||
function processInput($field, $value, $function = "") {
|
function processInput($field, $value, $function = "") {
|
||||||
$args = func_get_args();
|
$args = func_get_args();
|
||||||
return $this->_applyPlugin(__FUNCTION__, $args);
|
return $this->_applyPlugin(__FUNCTION__, $args);
|
||||||
|
|
Loading…
Reference in a new issue