The branch, QA_3_4 has been updated
via f7cb55cb626158d81ac606927142d8f55444b9ff (commit)
from 694c1cdf751e1fcbe2435087e3cea0dcd85ca458 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/db_search.js | 24 +++++++++++++-----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0219da3..904e529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,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 79c444e..f9a9416 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -48,18 +48,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['strHideQueryBox']);
-
- /** 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').show();
- $('#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
--
phpMyAdmin
Show replies by date