[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6541-g064d399

[Rouslan Placella]

The branch, master has been updated
       via  064d399d878f36a0a26f6db890b947bccb3ef8ab (commit)
       via  2ec0de3a9f8d77c750f02c27ba8d83b407a87ea5 (commit)
      from  9e8e70f0a1d21eaab1b3256c2249721150a93c7e (commit)


- Log -----------------------------------------------------------------
commit 064d399d878f36a0a26f6db890b947bccb3ef8ab
Merge: 9e8e70f0a1d21eaab1b3256c2249721150a93c7e 2ec0de3a9f8d77c750f02c27ba8d83b407a87ea5
Author: Rouslan Placella <rouslan at placella.com>
Date:   Mon Jul 4 13:03:14 2011 +0100

    Merge branch 'QA_3_4'
    
    Conflicts:
    	tbl_indexes.php

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

Summary of changes:
 ChangeLog       |    1 +
 js/indexes.js   |   12 ++++++------
 tbl_indexes.php |    4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 312e148..3842abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
 - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
 - bug #3340151 [export] Working SQL query exports error page
 - bug #3353649 [interface] "Create an index on X columns" form not validated
+- bug #3350790 [interface] JS error in Table->Structure->Index->Edit
 
 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
diff --git a/js/indexes.js b/js/indexes.js
index 9b64d92..ef6f877 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -17,24 +17,24 @@ function checkIndexName()
     }
 
     // Gets the elements pointers
-    var the_idx_name = document.forms['index_frm'].elements['index'];
-    var the_idx_type = document.forms['index_frm'].elements['index_type'];
+    var the_idx_name = document.forms['index_frm'].elements['index[Key_name]'];
+    var the_idx_type = document.forms['index_frm'].elements['index[Index_type]'];
 
     // Index is a primary key
     if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) {
-        document.forms['index_frm'].elements['index'].value = 'PRIMARY';
+        document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY';
         if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index'].disabled = true;
+            document.forms['index_frm'].elements['index[Key_name]'].disabled = true;
         }
     }
 
     // Other cases
     else {
         if (the_idx_name.value == 'PRIMARY') {
-            document.forms['index_frm'].elements['index'].value = '';
+            document.forms['index_frm'].elements['index[Key_name]'].value = '';
         }
         if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index'].disabled = false;
+            document.forms['index_frm'].elements['index[Key_name]'].disabled = false;
         }
     }
 
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 995ee24..6491c10 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -140,8 +140,8 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
 ?>
 
 <form action="./tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>
-    onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {
-        this.elements['index'].disabled = false}">
+    onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') {
+        this.elements['index[Key_name]'].disabled = false}">
 <?php
 $form_params = array(
     'db'    => $db,


hooks/post-receive
-- 
phpMyAdmin