The branch, master has been updated via 7962d72a46a006e293691181af82f889ecfa5e02 (commit) via e7877fba46743be0b351c526ccac216731ab8c1e (commit) from b5c2473afa5171ea67490bd500009d5dc39ff84c (commit)
- Log ----------------------------------------------------------------- commit 7962d72a46a006e293691181af82f889ecfa5e02 Merge: b5c2473 e7877fb Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Nov 20 23:37:22 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + js/tbl_structure.js | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 8e75172..74fb791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ phpMyAdmin - ChangeLog - [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page - bug #3439292 [core] Fail to synchronize column with name of keyword +- bug #3425156 [interface] Add column after drop
3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/js/tbl_structure.js b/js/tbl_structure.js index f02572f..c49165a 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -41,6 +41,10 @@ $(document).ready(function() { */ var curr_column_name = $(curr_row).children('th').children('label').text(); /** + * @var $after_field_item Corresponding entry in the 'After' field. + */ + var $after_field_item = $("select[name='after_field'] option[value='" + curr_column_name + "']"); + /** * @var question String containing the question to be asked for confirmation */ var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`'; @@ -52,6 +56,7 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + $after_field_item.remove(); $(curr_row).hide("medium").remove(); } else {
hooks/post-receive