[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-20-g2dfd1dc

The branch, QA_3_4 has been updated via 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c (commit) via efc03d8c8cfa354f703c7a40780035efa93235a4 (commit) from cc2fe91e767d2c38855f1bb866d71c4a721b82cd (commit) - Log ----------------------------------------------------------------- commit 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed Nov 9 00:33:11 2011 +0800 Added Changelog entry commit efc03d8c8cfa354f703c7a40780035efa93235a4 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Mon Nov 7 10:27:55 2011 +0800 Fix bug #3431427: Dropdown displaying results - setting NULL does not work ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/tbl_change.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f89acb6..bab9d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #3428065 [parser] TRUE not recognized by parser + patch #3433770 [config] Make location of php-gettext configurable - patch #3430291 [import] Handle conflicts in some open_basedir situations +- bug #3431427 [display] Dropdown results - setting NULL does not work 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/tbl_change.js b/js/tbl_change.js index 8fc7eca..79e7906 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -29,11 +29,11 @@ function nullify(theType, urlField, md5Field, multi_edit) // "SET" field , "ENUM" field with more than 20 characters // or foreign key field (drop-down) if (theType == 1 || theType == 3 || theType == 4) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].selectedIndex = -1; + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; } // Other "ENUM" field else if (theType == 2) { - var elts = rowForm.elements['field_' + md5Field + multi_edit + '[]']; + var elts = rowForm.elements['fields' + multi_edit + '[' + md5Field + ']']; // when there is just one option in ENUM: if (elts.checked) { elts.checked = false; @@ -47,7 +47,7 @@ function nullify(theType, urlField, md5Field, multi_edit) } // foreign key field (with browsing icon for foreign values) else if (theType == 6) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].value = ''; + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = ''; } // Other field types else /*if (theType == 5)*/ { hooks/post-receive -- phpMyAdmin