The branch, master has been updated via c52063d283fe2e58a397f6832b87ae9fceef0ef2 (commit) via f7cb55cb626158d81ac606927142d8f55444b9ff (commit) from 14e00c4dcb17872180964f4d8b2094d7bad55306 (commit)
- Log ----------------------------------------------------------------- commit c52063d283fe2e58a397f6832b87ae9fceef0ef2 Merge: 14e00c4 f7cb55c Author: Rouslan Placella rouslan@placella.com Date: Sun Oct 30 14:32:29 2011 +0000
Merge branch 'QA_3_4'
Conflicts: js/db_search.js
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + js/db_search.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 7fdc416..fc44298 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - bug #3427256 [interface] no links to browse/empty views and tables +- bug #3430377 [interface] Deleted search results remain visible
3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/js/db_search.js b/js/db_search.js index 79efddb..026d470 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -56,18 +56,20 @@ function deleteResult(result_path , msg , ajaxEnable) { if(ajaxEnable) { + var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Load the deleted option to the page*/ - $('#browse-results').load(result_path + " '"+'#result_query' + "'"); - $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); - $('#togglequerybox').html(PMA_messages['strShowQueryBox']); - - /** Refresh the search results after the deletion */ - document.getElementById('buttonGo'). click(); - PMA_ajaxShowMessage(PMA_messages['strDeleting']); - /** Show the results of the deletion option */ - $('#browse-results').show(); - $('#sqlqueryform').hide(); - $('#togglequerybox').show(); + $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here + $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page + /** Refresh the search results after the deletion */ + document.getElementById('buttonGo').click(); + $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + PMA_ajaxRemoveMessage($msg); + /** Show the results of the deletion option */ + $('#browse-results').show(); + $('#sqlqueryform').show(); + $('#togglequerybox').show(); + }); + }); } else {
hooks/post-receive
-
Rouslan Placella