[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-43-g29455fe

[Madhura Jayaratne]

The branch, QA_3_4 has been updated
       via  29455fe79bc9896129d7004e0242c451f4a32cc8 (commit)
       via  ff0ea2f9b960359234fab02a74b156bc9bb1e383 (commit)
      from  cf5faa1dd1bcae329eddb793765ad2ba3e4471dc (commit)


- Log -----------------------------------------------------------------
commit 29455fe79bc9896129d7004e0242c451f4a32cc8
Merge: ff0ea2f cf5faa1
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Thu Nov 24 23:12:37 2011 +0530

    Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4

commit ff0ea2f9b960359234fab02a74b156bc9bb1e383
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 79e7906..234e4e1 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