Display only first five columns in Editor example

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@919 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-27 16:51:40 +00:00
parent 8b3767360d
commit 6c97b80630
5 changed files with 12 additions and 12 deletions

View file

@ -59,9 +59,10 @@ class Adminer {
/** Field caption used in select and edit /** Field caption used in select and edit
* @param array single field returned from fields() * @param array single field returned from fields()
* @param int order of column in select
* @return string * @return string
*/ */
function fieldName($field) { function fieldName($field, $order = 0) {
return '<span title="' . htmlspecialchars($field["full_type"]) . '">' . htmlspecialchars($field["field"]) . '</span>'; return '<span title="' . htmlspecialchars($field["full_type"]) . '">' . htmlspecialchars($field["field"]) . '</span>';
} }

View file

@ -181,11 +181,13 @@ if (!$columns) {
echo "<thead><tr><td><input type='checkbox' id='all-page' onclick='form_check(this, /check/);'>"; echo "<thead><tr><td><input type='checkbox' id='all-page' onclick='form_check(this, /check/);'>";
$names = array(); $names = array();
reset($select); reset($select);
$order = 0;
foreach ($rows[0] as $key => $val) { foreach ($rows[0] as $key => $val) {
$val = $_GET["columns"][key($select)]; $val = $_GET["columns"][key($select)];
$field = $fields[$select ? $val["col"] : $key]; $field = $fields[$select ? $val["col"] : $key];
$name = ($field ? $adminer->fieldName($field) : "*"); $name = ($field ? $adminer->fieldName($field, $order) : "*");
if (strlen($name)) { if (strlen($name)) {
$order++;
$names[$key] = $name; $names[$key] = $name;
echo '<th><a href="' . htmlspecialchars(remove_from_uri('(order|desc)[^=]*') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"] == array($key) && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; echo '<th><a href="' . htmlspecialchars(remove_from_uri('(order|desc)[^=]*') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"] == array($key) && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>";
} }

View file

@ -23,14 +23,14 @@ function adminer_object() {
return ($login == 'admin'); return ($login == 'admin');
} }
function tableName($row) { function tableName($tableStatus) {
// tables without comments would return empty string and will be ignored by Adminer // tables without comments would return empty string and will be ignored by Adminer
return htmlspecialchars($row["Comment"]); return htmlspecialchars($tableStatus["Comment"]);
} }
function fieldName($field) { function fieldName($field, $order = 0) {
// fields without comments will be ignored // only first five columns with comments will be displayed
return ($field ? htmlspecialchars($field["comment"]) : "*"); return ($order < 5 ? htmlspecialchars($field["comment"]) : "");
} }
} }

View file

@ -32,7 +32,7 @@ class Adminer {
return htmlspecialchars(strlen($tableStatus["Comment"]) ? $tableStatus["Comment"] : $tableStatus["Name"]); return htmlspecialchars(strlen($tableStatus["Comment"]) ? $tableStatus["Comment"] : $tableStatus["Name"]);
} }
function fieldName($field) { function fieldName($field, $order = 0) {
return htmlspecialchars(strlen($field["comment"]) ? $field["comment"] : $field["field"]); return htmlspecialchars(strlen($field["comment"]) ? $field["comment"] : $field["field"]);
} }

View file

@ -22,10 +22,7 @@ Download external files (version checker and JUSH) from trusted HTTPS if Adminer
? AJAX editing - select page has all data to display edit form ? AJAX editing - select page has all data to display edit form
Editor: Editor:
Choose columns hidden in select
Restrict column selection in select to aggregation functions by index
JavaScript data validation JavaScript data validation
Joining tables - PRIMARY KEY (table, joining) Joining tables - PRIMARY KEY (table, joining)
Simplify search - textual, from-to
Rank, Tree structure Rank, Tree structure
Treat tinyint(1) as bool, format date Treat tinyint(1) as bool