The branch, master has been updated
via 0899300962ff0cc98767807e234c372a5054ab17 (commit)
from 52820d2d7044d862bff9e22eb7acb7abc739ee5e (commit)
- Log -----------------------------------------------------------------
commit 0899300962ff0cc98767807e234c372a5054ab17
Author: Madhura Jayaratne <[email protected]>
Date: Sun Feb 20 02:31:41 2011 +0530
Bug #3187096 [AJAX] Dropdown not displayed for foreign keyed fields
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 6fa24cd..a57abb2 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1235,11 +1235,12 @@ function PMA_displayTableBody(&$dt_result,
&$is_display, $map, $analyzed_sql) {
for ($i = 0; $i < $fields_cnt; ++$i) {
$meta = $fields_meta[$i];
$not_null_class = $meta->not_null ? 'not_null' : '';
+ $relation_class = isset($map[$meta->name]) ? 'relation' : '';
$pointer = $i;
$is_field_truncated = false;
//If the previous column had blob data, we need to reset the class
// to $inline_edit_class
- $class = 'data ' . $inline_edit_class . ' ' . $not_null_class . '
' . $alternating_color_class;
+ $class = 'data ' . $inline_edit_class . ' ' . $not_null_class . '
' . $alternating_color_class . ' ' . $relation_class;
// See if this column should get highlight because it's used in
the
// where-query.
@@ -2427,7 +2428,6 @@ function PMA_prepare_row_data($class, $condition_field,
$analyzed_sql, $meta, $m
$result = ' class="' . $class . ($condition_field ? ' condition' : '') .
$nowrap
. ' ' . ($is_field_truncated ? ' truncated' : '')
. ($transform_function != $default_function ? ' transformed' : '')
- . (isset($map[$meta->name]) ? ' relation' : '')
. $enum_class . $mime_type_class . '">';
if (isset($analyzed_sql[0]['select_expr']) &&
is_array($analyzed_sql[0]['select_expr'])) {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
