[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-266-geec80b2

[Marc Delisle]

The branch, master has been updated
       via  eec80b2a1fd7ef5283b2e8ed4665d02d007b4414 (commit)
      from  fcaedaf75bf6560d2c899aafa912320c52ff4505 (commit)


- Log -----------------------------------------------------------------
commit eec80b2a1fd7ef5283b2e8ed4665d02d007b4414
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Apr 30 14:56:02 2011 -0400

    Bug #3291923, Insert Ajax form does not generate default values - partial fix for text fields

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

Summary of changes:
 js/tbl_change.js |    2 +-
 tbl_change.php   |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/js/tbl_change.js b/js/tbl_change.js
index 896700b..8fc7eca 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -387,7 +387,7 @@ $(document).ready(function() {
                     if ($this_element.is('.textfield')) {
                         // do not remove the 'value' attribute for ENUM columns
                         if ($this_element.closest('tr').find('span.column_type').html() != 'enum') {
-                            $this_element.attr('value', '');
+                            $this_element.attr('value', $this_element.closest('tr').find('span.default_value').html());
                         }
                         $this_element
                         .unbind('change')
diff --git a/tbl_change.php b/tbl_change.php
index 1b6a2b6..22584db 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -694,6 +694,9 @@ foreach ($rows as $row_id => $vrow) {
         // HTML attribute
 
         echo '        <td>' . "\n";
+        // Will be used by js/tbl_change.js to set the default value
+        // for the "Continue insertion" feature
+        echo '<span class="default_value hide">' . $special_chars . '</span>';
         if ($foreignData['foreign_link'] == true) {
             echo $backup_field . "\n";
             ?>


hooks/post-receive
-- 
phpMyAdmin