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

Display Full/Partial text links for almost every select.

Browse Source
This commit is contained in:
Michal Čihař
2003-06-09 09:36:07 +00:00
parent f39c517e8f
commit 9164b6c728
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-09 Michal Cihar <nijel@users.sourceforge.net>
* libraries/display_tbl.lib.php3: Display Full/Partial text links for
almost every select.
2003-06-08 Alexander M. Turek <rabus@users.sourceforge.net> 2003-06-08 Alexander M. Turek <rabus@users.sourceforge.net>
* server_privileges.php3: MySQL 4.1 users could not edit column privileges. * server_privileges.php3: MySQL 4.1 users could not edit column privileges.
* tbl_properties.inc.php3, tbl_properties_structure.inc.php3: * tbl_properties.inc.php3, tbl_properties_structure.inc.php3:
@@ -2060,4 +2064,4 @@ $Source$
# vim: ft=changelog # vim: ft=changelog
# vim: expandtab ts=4 sw=4 sts=4 # vim: expandtab ts=4 sw=4 sts=4
# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>8&&getline(v\:lnum)!~'^#' # vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>8&&getline(v\:lnum)!~'^#'
# vim: fdn=1 fdm=expr # vim: fdn=1 fdm=expr

10
libraries/display_tbl.lib.php3
View File

@@ -110,7 +110,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
$do_display['nav_bar'] = (string) '0'; $do_display['nav_bar'] = (string) '0';
$do_display['ins_row'] = (string) '0'; $do_display['ins_row'] = (string) '0';
$do_display['bkm_form'] = (string) '1'; $do_display['bkm_form'] = (string) '1';
$do_display['text_btn'] = (string) '0'; $do_display['text_btn'] = (string) '1';
$do_display['pview_lnk'] = (string) '1'; $do_display['pview_lnk'] = (string) '1';
} }
// 2.3 Other statements (ie "SELECT" ones) -> updates // 2.3 Other statements (ie "SELECT" ones) -> updates
@@ -118,18 +118,12 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// $do_display['text_btn'] (keeps other default values) // $do_display['text_btn'] (keeps other default values)
else { else {
$prev_table = $fields_meta[0]->table; $prev_table = $fields_meta[0]->table;
$do_display['text_btn'] = (string) '1';
for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) { for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) {
$is_link = ($do_display['edit_lnk'] != 'nn' $is_link = ($do_display['edit_lnk'] != 'nn'
|| $do_display['del_lnk'] != 'nn' || $do_display['del_lnk'] != 'nn'
|| $do_display['sort_lnk'] != '0' || $do_display['sort_lnk'] != '0'
|| $do_display['ins_row'] != '0'); || $do_display['ins_row'] != '0');
// 2.3.1 Displays text cut/expand button?
if ($do_display['text_btn'] == '0' && eregi('BLOB', $fields_meta[$i]->type)) {
$do_display['text_btn'] = (string) '1';
if (!$is_link) {
break;
}
} // end if (2.3.1)
// 2.3.2 Displays edit/delete/sort/insert links? // 2.3.2 Displays edit/delete/sort/insert links?
if ($is_link if ($is_link
&& ($fields_meta[$i]->table == '' || $fields_meta[$i]->table != $prev_table)) { && ($fields_meta[$i]->table == '' || $fields_meta[$i]->table != $prev_table)) {