[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-25317-g87ecb35

Marc Delisle lem9 at users.sourceforge.net
Tue Dec 20 14:33:52 CET 2011


The branch, master has been updated
       via  87ecb350c94a2552368ad08bc0c70c09f05f4bf0 (commit)
      from  bd10afe2a9c0199a0e47185025c55f852afd3130 (commit)


- Log -----------------------------------------------------------------
commit 87ecb350c94a2552368ad08bc0c70c09f05f4bf0
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Dec 20 08:33:20 2011 -0500

    bug #3340842 [structure] Error dropping index of non-existing column

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

Summary of changes:
 ChangeLog           |    3 ++-
 js/tbl_structure.js |    2 ++
 sql.php             |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c73227..983ab2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,7 +64,8 @@ phpMyAdmin - ChangeLog
 - bug #3408377 [interface] Deleting table from the DB does not change the table counter
 + rfe #3438266 [designer] Toggle for relation lines
 - bug #3442069 [AJAX] database list not updated after adding/deleting a user + database
-- but #3461750 [edit] Sort by key generates wrong sql with limit clause
+- bug #3461750 [edit] Sort by key generates wrong sql with limit clause
+- bug #3340842 [structure] Error dropping index of non-existing column
 
 3.4.10.0 (not yet released)
 - bug #3460090 [interface] TextareaAutoSelect feature broken
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 5564bc0..1e1d696 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -64,6 +64,8 @@ $(document).ready(function() {
                     }
                     $after_field_item.remove();
                     $curr_row.hide("medium").remove();
+                    // refresh the list of indexes (comes from sql.php)
+                    $('#indexes').html(data.indexes_list);
                 }
                 else {
                     PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
diff --git a/sql.php b/sql.php
index 93b84da..4f30ba5 100644
--- a/sql.php
+++ b/sql.php
@@ -673,7 +673,8 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
     if (isset($dropped_column) && strlen($db) && strlen($table) && ! empty($dropped_column)) {
         include_once './libraries/relation_cleanup.lib.php';
         PMA_relationsCleanupColumn($db, $table, $dropped_column);
-
+        // to refresh the list of indexes (Ajax mode)
+        $extra_data['indexes_list'] = PMA_Index::getView($table, $db);
     } // end if column was dropped
 } // end else "didn't ask to see php code"
 


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list