nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not group if there would be one table in group.

Browse Source
This commit is contained in:
Lorikeet Lee
2010-04-07 09:19:34 +02:00
committed by Michal Čihař
parent 210b7631da
commit 8a7b66f3a0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -6,6 +6,8 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
3.3.3.0 (not yet released) 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) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

12
navigation.php
View File

@@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false,
echo '<ul id="subel' . $element_counter . '" style="display: none">'; echo '<ul id="subel' . $element_counter . '" style="display: none">';
} }
foreach ($tables as $group => $table) { 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'] $common_url_query = $GLOBALS['common_url_query']
. '&amp;tbl_group=' . urlencode($tab_group_full . $group); . '&amp;tbl_group=' . urlencode($tab_group_full . $group);
@@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false,
} }
echo '</li>' . "\n"; echo '</li>' . "\n";
} elseif (is_array($table)) { } 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']); $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']);
// quick access icon next to each table name // quick access icon next to each table name
echo '<li>' . "\n"; echo '<li>' . "\n";