remove hack in printTable function which remove properties action button and put...

diff --git a/aggregates.php b/aggregates.php
index 7dc42e46c8004e849572b7b19d402e6bdb3fdee3..095101058d9c488d08dcc6c3c92404e1137e5935 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.19 2007/04/23 13:44:04 soranzo Exp $
+        * $Id: aggregates.php,v 1.20 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -275,6 +275,8 @@
                        'aggrname' => array(
                                'title' => $lang['strname'],
                                'field' => 'proname',
+                               'url'   => "redirect.php?subject=aggregate&action=properties&{$misc->href}&",
+                               'vars'  => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'),
                        ),
                        'aggrtype' => array(
                                'title' => $lang['strtype'],
@@ -298,11 +300,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=aggregate&action=properties&{$misc->href}&",
-                               'vars'  => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'),
-                       ),              
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=alter&{$misc->href}&",

diff --git a/all_db.php b/all_db.php
index a2199a527e475df71cb8d78aeb1b66df7a278c8b..3fb69b2c976063a5036acf12bf99ae63a4dd41c5 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.50 2007/04/23 13:53:39 soranzo Exp $
+        * $Id: all_db.php,v 1.51 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -324,6 +324,8 @@
                        'database' => array(
                                'title' => $lang['strdatabase'],
                                'field' => 'datname',
+                               'url'   => "redirect.php?subject=database&{$misc->href}&",
+                               'vars'  => array('database' => 'datname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -352,11 +354,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=database&{$misc->href}&",
-                               'vars'  => array('database' => 'datname'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&subject=database&{$misc->href}&",

diff --git a/classes/Misc.php b/classes/Misc.php
index 727aff28188a3189a68be0c8b666cb0e8c6a4beb..df7cd6cd4c5526c423e81fb168f4a60bfeb78078 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.148 2007/05/02 16:12:07 ioguix Exp $
+        * $Id: Misc.php,v 1.149 2007/05/03 17:01:04 ioguix Exp $
         */
         
        class Misc {
@@ -514,7 +514,7 @@
                                                        'icon'  => 'Databases',
                                                )
                                        );
-                                       if ($data->hasRoles()) {
+                                       /*if ($data->hasRoles()) {
                                                $tmp = array_merge($tmp, array(
                                                        'roles' => array (
                                                                'title' => $lang['strroles'],
@@ -526,7 +526,7 @@
                                                        )
                                                ));
                                        }
-                                       else {
+                                       else {*/
                                                $tmp = array_merge($tmp, array(
                                                        'users' => array (
                                                                'title' => $lang['strusers'],
@@ -545,7 +545,7 @@
                                                                'icon'  => 'UserGroups',
                                                        )
                                                ));
-                                       }
+                                       //}
                                        
                                        $tmp = array_merge($tmp, array(                                                 
                                                'account' => array (
@@ -1572,17 +1572,6 @@
                                        unset($columns['comment']);
                                }
 
-                               // Apply the 'properties' action to the first column
-                               // and remove it from the action list.
-                               // (Remove this section to keep the 'Properties' button instead of links)
-                               if (isset($actions['properties'])) {
-                                       reset($columns);
-                                       list($first_column) = each($columns);
-                                       $columns[$first_column]['url'] = $actions['properties']['url'];
-                                       $columns[$first_column]['vars'] = $actions['properties']['vars'];
-                                       unset($actions['properties']);
-                               }
-                               
                                if (isset($columns['comment'])) {
                                        // Uncomment this for clipped comments.
                                        // TODO: This should be a user option.

diff --git a/domains.php b/domains.php
index d87bf90c4779ee84da1885c43ff5d0e58af86745..5bd881961cee9305a90b6d46dccbf0177e4d428f 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.27 2007/04/23 14:23:24 soranzo Exp $
+        * $Id: domains.php,v 1.28 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -378,6 +378,8 @@
                        'domain' => array(
                                'title' => $lang['strdomain'],
                                'field' => 'domname',
+                               'url' => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('domain' => 'domname'),
                        ),
                        'type' => array(
                                'title' => $lang['strtype'],
@@ -407,11 +409,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('domain' => 'domname'),
-                       ),
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=alter&{$misc->href}&",

diff --git a/functions.php b/functions.php
index a9e1836d96d0f1ef2d4f02ca6625f72db35ae9ef..0e1017f7eb4b47440ea0c6dce6c71100bae94b3b 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.62 2007/04/23 18:48:06 soranzo Exp $
+        * $Id: functions.php,v 1.63 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -632,6 +632,8 @@
                                'title' => $lang['strfunction'],
                                'field' => 'proproto',
                                'type'  => 'verbatim',
+                               'url'   => "redirect.php?subject=function&action=properties&{$misc->href}&",
+                               'vars'  => array('function' => 'proproto', 'function_oid' => 'prooid'),
                        ),
                        'returns' => array(
                                'title' => $lang['strreturns'],
@@ -656,11 +658,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=function&action=properties&{$misc->href}&",
-                               'vars'  => array('function' => 'proproto', 'function_oid' => 'prooid'),
-                       ),
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=edit&{$misc->href}&",

diff --git a/groups.php b/groups.php
index fba7ea2ad8f7b05ab06343982240030cd33100ba..27f7cf04fb14bf3defbe9d710d2dcb9ff6fd5db9 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
        /**
         * Manage groups in a database cluster
         *
-        * $Id: groups.php,v 1.22 2007/01/15 15:48:17 soranzo Exp $
+        * $Id: groups.php,v 1.23 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -220,6 +220,8 @@
                        'group' => array(
                                'title' => $lang['strgroup'],
                                'field' => 'groname',
+                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('group' => 'groname'),
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
@@ -227,11 +229,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('group' => 'groname'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&",

diff --git a/operators.php b/operators.php
index 4e54f5cf507cc6a15415a897546d855da66fba59..d9b2d8cd88e2855994e805e5cfb81410fdb9b893 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.24 2007/04/23 18:48:06 soranzo Exp $
+        * $Id: operators.php,v 1.25 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -116,6 +116,8 @@
                        'operator' => array(
                                'title' => $lang['stroperator'],
                                'field' => 'oprname',
+                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('operator' => 'oprname', 'operator_oid' => 'oid'),
                        ),
                        'leftarg' => array(
                                'title' => $lang['strleftarg'],
@@ -139,11 +141,6 @@
                );
 
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('operator' => 'oprname', 'operator_oid' => 'oid'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&",

diff --git a/plugin_slony.php b/plugin_slony.php
index 845ff8a5008e972b15a39cbe92e6376c53d19ca7..a1813a2b92a522db4b17416f72ab6a7b7b4e4a63 100755 (executable)
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.17 2007/04/23 18:48:06 soranzo Exp $
+        * $Id: plugin_slony.php,v 1.18 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -435,6 +435,8 @@
                        'no_name' => array(
                                'title' => $lang['strcluster'],
                                'field' => 'cluster'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=cluster_properties&",
+                               'vars'  => array('slony_cluster' => 'cluster')
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
@@ -446,11 +448,6 @@
                );
                
                $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=cluster_properties&",
-                               'vars'  => array('slony_cluster' => 'cluster')
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_cluster&",
@@ -602,6 +599,8 @@
                        'no_name' => array(
                                'title' => $lang['strname'],
                                'field' => 'no_comment'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=node_properties&subject=slony_node&",
+                               'vars'  => array('no_id' => 'no_id', 'no_name' => 'no_comment')
                        ),
                        'no_status' => array(
                                'title' => $lang['strstatus'],
@@ -618,11 +617,6 @@
                );
                
                $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=node_properties&subject=slony_node&",
-                               'vars'  => array('no_id' => 'no_id', 'no_name' => 'no_comment')
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_node&subject=slony_node&",
@@ -761,6 +755,8 @@
                        'no_name' => array(
                                'title' => $lang['strname'],
                                'field' => 'no_comment'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=path_properties&",
+                               'vars'  => array('no_id' => 'pa_client', 'path_id' => 'no_id')
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
@@ -772,11 +768,6 @@
                );
                
                $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=path_properties&",
-                               'vars'  => array('no_id' => 'pa_client', 'path_id' => 'no_id')
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_path&",
@@ -938,6 +929,8 @@
                        'no_name' => array(
                                'title' => $lang['strname'],
                                'field' => 'no_comment'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=listen_properties&",
+                               'vars'  => array('no_id' => 'li_receiver', 'listen_id' => 'no_id', 'origin_id' => 'li_origin')
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
@@ -949,11 +942,6 @@
                );
                
                $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=listen_properties&",
-                               'vars'  => array('no_id' => 'li_receiver', 'listen_id' => 'no_id', 'origin_id' => 'li_origin')
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_listen&",
@@ -1110,6 +1098,8 @@
                        'set_name' => array(
                                'title' => $lang['strname'],
                                'field' => 'set_comment'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=set_properties&",
+                               'vars'  => array('set_id' => 'set_id')
                        ),
                        'actions' => array(
                                'title' => $lang['stractions'],
@@ -1121,11 +1111,6 @@
                );
                
                $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=set_properties&",
-                               'vars'  => array('set_id' => 'set_id')
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_set&",
@@ -1512,6 +1497,8 @@
                        'table' => array(
                                'title' => $lang['strtable'],
                                'field' => 'qualname',
+                               'url'   => "redirect.php?subject=table&{$misc->href}&",
+                               'vars'  => array('table' => 'relname', 'schema' => 'nspname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -1536,11 +1523,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=table&{$misc->href}&",
-                               'vars'  => array('table' => 'relname', 'schema' => 'nspname'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_table&set_id={$_REQUEST['set_id']}&",
@@ -1796,6 +1778,8 @@
                        'sequence' => array(
                                'title' => $lang['strsequence'],
                                'field' => 'qualname',
+                               'url'   => "sequences.php?action=properties&{$misc->href}&",
+                               'vars'  => array('sequence' => 'seqname', 'schema' => 'nspname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -1811,11 +1795,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "sequences.php?action=properties&{$misc->href}&",
-                               'vars'  => array('sequence' => 'seqname', 'schema' => 'nspname'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "plugin_slony.php?{$misc->href}&action=confirm_drop_sequence&set_id={$_REQUEST['set_id']}&",
@@ -2002,23 +1981,16 @@
                        'no_name' => array(
                                'title' => $lang['strname'],
                                'field' => 'no_comment'
+                               'url'   => "plugin_slony.php?{$misc->href}&action=subscription_properties&",
+                               'vars'  => array('set_id' => 'sub_set', 'no_id' => 'no_id')
                        ),
-/*                     'actions' => array(
-                               'title' => $lang['stractions'],
-                       ),*/
                        'no_comment' => array(
                                'title' => $lang['strcomment'],
                                'field' => 'no_comment'
                        )
                );
                
-               $actions = array (
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "plugin_slony.php?{$misc->href}&action=subscription_properties&",
-                               'vars'  => array('set_id' => 'sub_set', 'no_id' => 'no_id')
-                       )
-               );
+               $actions = array ();
                
                $misc->printTable($subscriptions, $columns, $actions, $lang['strnosubscriptions']);
        }

diff --git a/reports.php b/reports.php
index 747c6f7ba38a957e6413fbff4e28284154e5b23c..e4f4407f43690c4011a8affe292424459bfbcafd 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.27 2007/04/24 15:31:29 soranzo Exp $
+        * $Id: reports.php,v 1.28 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -251,6 +251,8 @@
                        'report' => array(
                                'title' => $lang['strreport'],
                                'field' => 'report_name',
+                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('report_id' => 'report_id'),
                        ),
                        'database' => array(
                                'title' => $lang['strdatabase'],
@@ -272,11 +274,6 @@
                $return_url = urlencode("{$PHP_SELF}?{$misc->href}");
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('report_id' => 'report_id'),
-                       ),
                        'run' => array(
                                'title' => $lang['strexecute'],
                                'url'   => "sql.php?subject=report&{$misc->href}&return_url={$return_url}&return_desc=".urlencode($lang['strback'])."&",

diff --git a/roles.php b/roles.php
index d8c0ce8c3b625b22cd932d271fb759596498674c..bf47fce5ebea50df0459cc31a5aaa191f02a0462 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -3,7 +3,7 @@
        /**
         * Manage roles in a database cluster
         *
-        * $Id: roles.php,v 1.5 2007/04/23 15:10:30 soranzo Exp $
+        * $Id: roles.php,v 1.6 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -559,6 +559,8 @@
                        'role' => array(
                                'title' => $lang['strrole'],
                                'field' => 'rolname',
+                               'url'   => "redirect.php?subject=role&action=properties&{$misc->href}&",
+                               'vars'  => array('rolename' => 'rolname'),
                        ),
                        'superuser' => array(
                                'title' => $lang['strsuper'],
@@ -603,11 +605,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=role&action=properties&{$misc->href}&",
-                               'vars'  => array('rolename' => 'rolname'),
-                       ),              
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=alter&{$misc->href}&",

diff --git a/schemas.php b/schemas.php
index f13887eca7e31c1e4d78b44e9017f50cb7e02b3d..862a23b329060f8bcb072fb48deb888b45897032 100755 (executable)
--- a/schemas.php
+++ b/schemas.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas in a database
         *
-        * $Id: schemas.php,v 1.13 2007/04/23 18:48:06 soranzo Exp $
+        * $Id: schemas.php,v 1.14 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -32,6 +32,8 @@
                                'schema' => array(
                                        'title' => $lang['strschema'],
                                        'field' => 'nspname',
+                                       'url'   => "redirect.php?subject=schema&{$misc->href}&",
+                                       'vars'  => array('schema' => 'nspname'),
                                ),
                                'owner' => array(
                                        'title' => $lang['strowner'],
@@ -47,11 +49,6 @@
                        );
                        
                        $actions = array(
-                               'properties' => array(
-                                       'title' => $lang['strproperties'],
-                                       'url'   => "redirect.php?subject=schema&{$misc->href}&",
-                                       'vars'  => array('schema' => 'nspname'),
-                               ),
                                'drop' => array(
                                        'title' => $lang['strdrop'],
                                        'url'   => "{$PHP_SELF}?action=drop&{$misc->href}&",

diff --git a/sequences.php b/sequences.php
index daaf3e824d0f9bae2d5c2e80d38b487aabd6463a..f3cd2db5421174b1352e97411c98c727ba6a8ace 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.38 2007/04/24 10:31:52 soranzo Exp $
+        * $Id: sequences.php,v 1.39 2007/05/03 17:01:03 ioguix Exp $
         */
        
        // Include application functions
@@ -31,6 +31,8 @@
                        'sequence' => array(
                                'title' => $lang['strsequence'],
                                'field' => 'seqname',
+                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('sequence' => 'seqname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -46,11 +48,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('sequence' => 'seqname'),
-                       ),
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "sequences.php?action=confirm_alter&{$misc->href}&subject=sequence&",

diff --git a/servers.php b/servers.php
index 833d2d9e40748dd6a8e0061acc26dca4789deeae..f966263ef9b5162d640f1c5293f88dbeeaf4eb62 100644 (file)
--- a/servers.php
+++ b/servers.php
@@ -3,7 +3,7 @@
        /**
         * Manage servers
         *
-        * $Id: servers.php,v 1.6 2007/01/10 01:25:12 soranzo Exp $
+        * $Id: servers.php,v 1.7 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -42,6 +42,8 @@
                        'server' => array(
                                'title' => $lang['strserver'],
                                'field' => 'desc',
+                               'url'   => "redirect.php?subject=server&",
+                               'vars'  => array('server' => 'id'),
                        ),
                        'host' => array(
                                'title' => $lang['strhost'],
@@ -61,11 +63,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=server&",
-                               'vars'  => array('server' => 'id'),
-                       ),
                        'logout' => array(
                                'title' => $lang['strlogout'],
                                'url'   => "{$PHP_SELF}?action=logout&",

diff --git a/tables.php b/tables.php
index 576e61768d76fe77a7ce601112e0fe75f2d07fa8..a1efbcf44cd69e2198b2367cf5df98c18a039da9 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.94 2007/05/02 16:12:07 ioguix Exp $
+        * $Id: tables.php,v 1.95 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -813,6 +813,8 @@
                        'table' => array(
                                'title' => $lang['strtable'],
                                'field' => 'relname',
+                               'url'           => "redirect.php?subject=table&{$misc->href}&",
+                               'vars'  => array('table' => 'relname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -837,11 +839,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=table&{$misc->href}&",
-                               'vars'  => array('table' => 'relname'),
-                       ),
                        'browse' => array(
                                'title' => $lang['strbrowse'],
                                'url'   => "display.php?{$misc->href}&subject=table&return_url=".urlencode("tables.php?{$misc->href}")."&return_desc=".urlencode($lang['strback'])."&",

diff --git a/tblproperties.php b/tblproperties.php
index 410cc72407bad5203add6f5c1ab99c8d2488ad98..5bb48feb8fe08988fed094313735f1cd8b997a27 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.77 2007/04/24 14:49:00 soranzo Exp $
+        * $Id: tblproperties.php,v 1.78 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -616,6 +616,8 @@
                        'column' => array(
                                'title' => $lang['strcolumn'],
                                'field' => 'attname',
+                               'url'   => "colproperties.php?subject=column&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
+                               'vars'  => array('column' => 'attname'),
                        ),
                        'type' => array(
                                'title' => $lang['strtype'],
@@ -641,11 +643,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "colproperties.php?subject=column&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",
-                               'vars'  => array('column' => 'attname'),
-                       ),
                        'alter' => array(
                                'title' => $lang['stralter'],
                                'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&table=".urlencode($_REQUEST['table'])."&",

diff --git a/types.php b/types.php
index 5b3edfca225c3661740879853a37dc704f4021b8..22eeea1e06ae91a8fe4c257da35b753014795bfe 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.34 2007/04/23 15:28:42 soranzo Exp $
+        * $Id: types.php,v 1.35 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -406,6 +406,8 @@
                        'type' => array(
                                'title' => $lang['strtype'],
                                'field' => 'typname',
+                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
+                               'vars'  => array('type' => 'basename'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -437,11 +439,6 @@
                if (!isset($types->fields['typtype'])) unset($columns['flavour']);
 
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "{$PHP_SELF}?action=properties&{$misc->href}&",
-                               'vars'  => array('type' => 'basename'),
-                       ),
                        'drop' => array(
                                'title' => $lang['strdrop'],
                                'url'   => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&",

diff --git a/views.php b/views.php
index 39d6f32eab8474b559be7ce6df7b78d94a71cf8f..4b6e1dde5abe2858ca1c70aab4faee857d03cf6e 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.68 2007/05/02 16:12:07 ioguix Exp $
+        * $Id: views.php,v 1.69 2007/05/03 17:01:03 ioguix Exp $
         */
 
        // Include application functions
@@ -550,6 +550,8 @@
                        'view' => array(
                                'title' => $lang['strview'],
                                'field' => 'relname',
+                               'url' => "redirect.php?subject=view&{$misc->href}&",
+                               'vars'  => array('view' => 'relname'),
                        ),
                        'owner' => array(
                                'title' => $lang['strowner'],
@@ -565,11 +567,6 @@
                );
                
                $actions = array(
-                       'properties' => array(
-                               'title' => $lang['strproperties'],
-                               'url'   => "redirect.php?subject=view&{$misc->href}&",
-                               'vars'  => array('view' => 'relname'),
-                       ),
                        'browse' => array(
                                'title' => $lang['strbrowse'],
                                'url'   => "display.php?{$misc->href}&subject=view&return_url=".urlencode("views.php?{$misc->href}")."&return_desc=".urlencode($lang['strback'])."&",