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

patch #2538358 [display] Conditions for relational display field

Browse Source
This commit is contained in:
Marc Delisle
2009-01-27 18:26:30 +00:00
parent e0f85b87c2
commit 1b6073b800
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -14,6 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Giovanni Giacobbi - themnemonic thanks to Giovanni Giacobbi - themnemonic
- bug [display] Message "Bookmark created" is not displaying - bug [display] Message "Bookmark created" is not displaying
+ [display] Show AUTO_INCREMENT instead of A_I when in vertical mode + [display] Show AUTO_INCREMENT instead of A_I when in vertical mode
- patch #2538358 [display] Conditions for relational display field,
thanks to Virsacer - virsacer
3.1.2.0 (2009-01-19) 3.1.2.0 (2009-01-19)
- bug #1253252 [display] Can't NULL a column with relation defined - bug #1253252 [display] Can't NULL a column with relation defined

2
libraries/display_tbl.lib.php
View File

@@ -554,7 +554,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
PMA_generate_html_radio('display_text', $choices, $_SESSION['userconf']['display_text']); PMA_generate_html_radio('display_text', $choices, $_SESSION['userconf']['display_text']);
echo '</div>'; echo '</div>';
if ($GLOBALS['cfgRelation']['relwork']) { if ($GLOBALS['cfgRelation']['relwork'] && $GLOBALS['cfgRelation']['displaywork']) {
echo '<div class="formelement">'; echo '<div class="formelement">';
$choices = array( $choices = array(
'K' => $GLOBALS['strRelationalKey'], 'K' => $GLOBALS['strRelationalKey'],

2
libraries/relation.lib.php
View File

@@ -117,7 +117,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForFeature('strGeneralRelationFeat', 'relwork', $messages); PMA_printDiagMessageForFeature('strGeneralRelationFeat', 'relwork', $messages);
PMA_printDiagMessageForParameter('table_info', isset($cfgRelation['displaywork']), $messages, 'table_info'); PMA_printDiagMessageForParameter('table_info', $cfgRelation['displaywork'], $messages, 'table_info');
PMA_printDiagMessageForFeature('strDisplayFeat', 'displaywork', $messages); PMA_printDiagMessageForFeature('strDisplayFeat', 'displaywork', $messages);