[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23127-gb5c2473

[Madhura Jayaratne]

The branch, master has been updated
       via  b5c2473afa5171ea67490bd500009d5dc39ff84c (commit)
      from  6e2f6f71d38966da33ba4a68e76176a88faf2685 (commit)


- Log -----------------------------------------------------------------
commit b5c2473afa5171ea67490bd500009d5dc39ff84c
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Nov 20 23:01:58 2011 +0530

    bug #3431427: Fix for enum and set columns

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

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

diff --git a/js/tbl_change.js b/js/tbl_change.js
index 8cb710a..bfe5934 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -26,10 +26,9 @@ function nullify(theType, urlField, md5Field, multi_edit)
         rowForm.elements['funcs' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1;
     }
 
-    // "SET" field , "ENUM" field with more than 20 characters
-    // or foreign key field (drop-down)
-    if (theType == 1 || theType == 3 || theType == 4) {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field +  ']'].selectedIndex = -1;
+    // "ENUM" field with more than 20 characters
+    if (theType == 1) {
+        rowForm.elements['fields' + multi_edit + '[' + md5Field +  ']'][1].selectedIndex = -1;
     }
     // Other "ENUM" field
     else if (theType == 2) {
@@ -45,6 +44,14 @@ function nullify(theType, urlField, md5Field, multi_edit)
 
         } // end if
     }
+    // "SET" field
+    else if (theType == 3) {
+        rowForm.elements['fields' + multi_edit + '[' + md5Field +  '][]'].selectedIndex = -1;
+    }
+    // Foreign key field (drop-down)
+    else if (theType == 4) {
+        rowForm.elements['fields' + multi_edit + '[' + md5Field +  ']'].selectedIndex = -1;
+    }
     // foreign key field (with browsing icon for foreign values)
     else if (theType == 6) {
         rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = '';


hooks/post-receive
-- 
phpMyAdmin