Do not group if there would be one table in group.
This commit is contained in:

committed by
Michal Čihař

parent
210b7631da
commit
8a7b66f3a0
@@ -6,6 +6,8 @@ $Id$
|
||||
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
|
||||
|
||||
3.3.3.0 (not yet released)
|
||||
- patch #2982480 [navi] Do not group if there would be one table in group,
|
||||
thanks to Lorikeet Lee.
|
||||
|
||||
3.3.2.0 (not yet released)
|
||||
- patch #2969449 [core] Name for MERGE engine varies depending on the
|
||||
|
@@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false,
|
||||
echo '<ul id="subel' . $element_counter . '" style="display: none">';
|
||||
}
|
||||
foreach ($tables as $group => $table) {
|
||||
if (isset($table['is' . $sep . 'group'])) {
|
||||
// only allow grouping if the group has more than 1 table
|
||||
if (isset($table['is' . $sep . 'group']) && $table['tab' . $sep . 'count'] > 1) {
|
||||
$common_url_query = $GLOBALS['common_url_query']
|
||||
. '&tbl_group=' . urlencode($tab_group_full . $group);
|
||||
|
||||
@@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false,
|
||||
}
|
||||
echo '</li>' . "\n";
|
||||
} elseif (is_array($table)) {
|
||||
// the table was not grouped because it is the only one with its prefix
|
||||
if (isset($table['is' . $sep . 'group'])) {
|
||||
// get the array with the actual table information
|
||||
foreach ($table as $value) {
|
||||
if(is_array($value)) {
|
||||
$table = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
$link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']);
|
||||
// quick access icon next to each table name
|
||||
echo '<li>' . "\n";
|
||||
|
Reference in New Issue
Block a user