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

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 63067301bb3d3096c8830fa615ed2c204d37d70d..65089a0e83f26e08d95ea41d2ee884cac7eac289 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -59,9 +59,10 @@ class Adminer {
        
        /** Field caption used in select and edit
        * @param array single field returned from fields()
+       * @param int order of column in select
        * @return string
        */
-       function fieldName($field) {
+       function fieldName($field, $order = 0) {
                return '<span title="' . htmlspecialchars($field["full_type"]) . '">' . htmlspecialchars($field["field"]) . '</span>';
        }
        

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 7aa5eea7ca829396b6f7fec1e2de39a64dd96502..f7ca86a51416ad76c585e0b3686523f14ddabd0e 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -181,11 +181,13 @@ if (!$columns) {
                        echo "<thead><tr><td><input type='checkbox' id='all-page' onclick='form_check(this, /check/);'>";
                        $names = array();
                        reset($select);
+                       $order = 0;
                        foreach ($rows[0] as $key => $val) {
                                $val = $_GET["columns"][key($select)];
                                $field = $fields[$select ? $val["col"] : $key];
-                               $name = ($field ? $adminer->fieldName($field) : "*");
+                               $name = ($field ? $adminer->fieldName($field, $order) : "*");
                                if (strlen($name)) {
+                                       $order++;
                                        $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>";
                                }

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

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 20df161ceb2ff51e97b04885cd7c1c6b3034bab7..59bc8eea2e471f3d06a8daf61d8449a31930ec3f 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -32,7 +32,7 @@ class Adminer {
                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"]);
        }
        

diff --git a/todo.txt b/todo.txt
index c909968a5f1bf4723760a1310a42491a6475ef7c..7eee427c85d3a63d0a858cb747022ee48397cbfd 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -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
 
 Editor:
-Choose columns hidden in select
-Restrict column selection in select to aggregation functions by index
 JavaScript data validation
 Joining tables - PRIMARY KEY (table, joining)
-Simplify search - textual, from-to
 Rank, Tree structure
-Treat tinyint(1) as bool, format date
+Treat tinyint(1) as bool