[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23457-gbbc44c4

[Madhura Jayaratne]

The branch, master has been updated
       via  bbc44c410c0ee31207821be28f57bb203749801d (commit)
       via  9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit)
       via  c43babad7cbde73098ded7fe502027a1af731f4b (commit)
      from  b82662961f049474db17fc4af0f848e40c01498a (commit)


- Log -----------------------------------------------------------------
commit bbc44c410c0ee31207821be28f57bb203749801d
Merge: b826629 9c278d0
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Nov 25 18:25:13 2011 +0530

    Merge branch 'QA_3_4'
    
    Conflicts:
    	ChangeLog
    	Documentation.html
    	README
    	libraries/Config.class.php
    	libraries/display_tbl.lib.php

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    1 +
 libraries/display_tbl.lib.php |   16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c895ddb..b4bfec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog
 + [interface] Improved index editor
 
 3.4.9.0 (not yet released)
+- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
 
 3.4.8.0 (not yet released)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index e85ec3f..5b39565 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1146,13 +1146,15 @@ function PMA_buildValueDisplay($class, $condition_field, $value)
  *
  * @param string $class           class of table cell
  * @param bool   $condition_field whether to add CSS class condition
+ * @param object $meta            the meta-information about this field
+ * @param string $align           cell allignment
  *
  * @return  string  the td
  */
-function PMA_buildNullDisplay($class, $condition_field)
+function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '')
 {
     // the null class is needed for grid editing
-    return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null"><i>NULL</i></td>';
+    return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null"><i>NULL</i></td>';
 }
 
 /**
@@ -1546,7 +1548,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                 //       so use the $pointer
 
                 if (! isset($row[$i]) || is_null($row[$i])) {
-                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field);
+                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"');
                 } elseif ($row[$i] != '') {
 
                     $nowrap = ' nowrap';
@@ -1569,7 +1571,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                     $class = str_replace('grid_edit', '', $class);
 
                     if (! isset($row[$i]) || is_null($row[$i])) {
-                        $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field);
+                        $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field, $meta);
                     } else {
                         // for blobstreaming
                         // if valid BS reference exists
@@ -1585,7 +1587,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                 // not binary:
                 } else {
                     if (! isset($row[$i]) || is_null($row[$i])) {
-                        $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field);
+                        $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field, $meta);
                     } elseif ($row[$i] != '') {
                         // if a transform function for blob is set, none of these replacements will be made
                         if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') {
@@ -1612,7 +1614,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                 $class = str_replace('grid_edit', '', $class);
 
                 if (! isset($row[$i]) || is_null($row[$i])) {
-                    $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
+                    $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta);
                 } elseif ($row[$i] != '') {
                     // Display as [GEOMETRY - (size)]
                     if ('GEOM' == $_SESSION['tmp_user_values']['geometry_display']) {
@@ -1681,7 +1683,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
             // n o t   n u m e r i c   a n d   n o t   B L O B
             } else {
                 if (! isset($row[$i]) || is_null($row[$i])) {
-                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field);
+                    $vertical_display['data'][$row_no][$i]     =  PMA_buildNullDisplay($class, $condition_field, $meta);
                 } elseif ($row[$i] != '') {
                     // support blanks in the key
                     $relation_id = $row[$i];


hooks/post-receive
-- 
phpMyAdmin