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

RFE #550554 - execute bookmarks when browsing this table.

Browse Source
This commit is contained in:
Garvin Hicking
2003-03-12 21:23:36 +00:00
parent e6d1ae755a
commit 7eafab8a29
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -6,6 +6,10 @@ $Id$
$Source$ $Source$
2003-03-12 Garvin Hicking <me@supergarv.de> 2003-03-12 Garvin Hicking <me@supergarv.de>
* db_details_structure.php3: When using Alias-Displays for Tables, fix bug when a tablename
was not displayed if it has no comment.
* libraries/display_tbl.lib.php3 RFE #550554 - Execute SQL bookmarks when browsing the
bookmarktable.
* db_details_structure.php, left.php3, tbl_properties_links.php3, libraries/bookmark.lib.php3: * db_details_structure.php, left.php3, tbl_properties_links.php3, libraries/bookmark.lib.php3:
RFE #550552: Change default initial query for browse mode, if a bookmark with the same RFE #550552: Change default initial query for browse mode, if a bookmark with the same
label as the tablename is found. label as the tablename is found.

2
db_details_structure.php3
View File

@@ -61,7 +61,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
$result = PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db)); $result = PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db));
while ($tmp = PMA_mysql_fetch_array($result)) { while ($tmp = PMA_mysql_fetch_array($result)) {
$tooltip_truename[$tmp['Name']] = ($cfg['ShowTooltipAliasTB'] ? (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '') : $tmp['Name']); $tooltip_truename[$tmp['Name']] = ($cfg['ShowTooltipAliasTB'] ? (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : $tmp['Name']) : $tmp['Name']);
$tooltip_aliasname[$tmp['Name']] = ($cfg['ShowTooltipAliasTB'] ? $tmp['Name'] : (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '')); $tooltip_aliasname[$tmp['Name']] = ($cfg['ShowTooltipAliasTB'] ? $tmp['Name'] : (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : ''));
} // end while } // end while
} // end if } // end if

26
libraries/display_tbl.lib.php3
View File

@@ -943,6 +943,17 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
$edit_str = $GLOBALS['strEdit']; $edit_str = $GLOBALS['strEdit'];
} // end if (1.2.1) } // end if (1.2.1)
if ($table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db']) {
$bookmark_go = '<form method="post" target="phpmain" action="read_dump.php3">'
. PMA_generate_common_hidden_inputs($row['dbase'], '')
. '<input type="hidden" name="id_bookmark" value="' . $row['id'] . '" />'
. '<input type="hidden" name="action_bookmark" value="0" />'
. '<input type="submit" name="SQL" value="' . $GLOBALS['strGo'] . '" />'
. '</form>';
} else {
$bookmark_go = '';
}
// 1.2.2 Delete/Kill link(s) // 1.2.2 Delete/Kill link(s)
if ($is_display['del_lnk'] == 'dr') { // delete row case if ($is_display['del_lnk'] == 'dr') { // delete row case
$lnk_goto = 'sql.php3' $lnk_goto = 'sql.php3'
@@ -976,12 +987,13 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
&& ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
if (!empty($edit_url)) { if (!empty($edit_url)) {
echo ' <td bgcolor="' . $bgcolor . '">' . "\n"; echo ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n";
echo PMA_linkOrButton($edit_url, $edit_str, ''); echo PMA_linkOrButton($edit_url, $edit_str, '');
echo $bookmark_go;
echo ' </td>' . "\n"; echo ' </td>' . "\n";
} }
if (!empty($del_url)) { if (!empty($del_url)) {
echo ' <td bgcolor="' . $bgcolor . '">' . "\n"; echo ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n";
echo PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : '')); echo PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''));
echo ' </td>' . "\n"; echo ' </td>' . "\n";
} }
@@ -1236,12 +1248,13 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] if ($GLOBALS['cfg']['ModifyDeleteAtRight']
&& ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
if (!empty($edit_url)) { if (!empty($edit_url)) {
echo ' <td bgcolor="' . $bgcolor . '">' . "\n"; echo ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n";
echo PMA_linkOrButton($edit_url, $edit_str, ''); echo PMA_linkOrButton($edit_url, $edit_str, '');
echo $bookmark_go;
echo ' </td>' . "\n"; echo ' </td>' . "\n";
} }
if (!empty($del_url)) { if (!empty($del_url)) {
echo ' <td bgcolor="' . $bgcolor . '">' . "\n"; echo ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . ' bgcolor="' . $bgcolor . '">' . "\n";
echo PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : '')); echo PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''));
echo ' </td>' . "\n"; echo ' </td>' . "\n";
} }
@@ -1262,13 +1275,14 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
} }
if (isset($edit_url)) { if (isset($edit_url)) {
$vertical_display['edit'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['edit'][$row_no] .= ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '') . PMA_linkOrButton($edit_url, $edit_str, '')
. $bookmark_go
. ' </td>' . "\n"; . ' </td>' . "\n";
} }
if (isset($del_url)) { if (isset($del_url)) {
$vertical_display['delete'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['delete'][$row_no] .= ' <td valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : '')) . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''))
. ' </td>' . "\n"; . ' </td>' . "\n";
} }