From a994e13c3315f45d88782b51c0f71385074a8251 Mon Sep 17 00:00:00 2001 From: Thilanka Date: Mon, 28 Feb 2011 12:44:44 -0500 Subject: [PATCH 1/4] Ajaxify browse and delete criteria in DB search --- db_search.php | 32 +++++++++---- js/db_search.js | 98 ++++++++++++++++++++++++++++++++++++---- js/messages.php | 2 + libraries/common.lib.php | 2 +- 4 files changed, 116 insertions(+), 18 deletions(-) diff --git a/db_search.php b/db_search.php index 427539911..8362fc7ca 100644 --- a/db_search.php +++ b/db_search.php @@ -249,16 +249,16 @@ if (isset($_REQUEST['submit_search'])) { if ($res_cnt > 0) { $this_url_params['sql_query'] = $newsearchsqls['select_fields']; - echo '' . PMA_linkOrButton( - 'sql.php' . PMA_generate_common_url($this_url_params), - __('Browse'), '') . "\n"; - + $browse_result_path = 'sql.php' . PMA_generate_common_url($this_url_params); + ?> + + ' . PMA_linkOrButton( - 'sql.php' . PMA_generate_common_url($this_url_params), - __('Delete'), sprintf(__('Delete the matches for the %s table?'), htmlspecialchars($each_table))) . "\n"; - - } else { + $delete_result_path = 'sql.php' . PMA_generate_common_url($this_url_params); + ?> + +  ' . "\n" .' ' . "\n"; }// end if else @@ -360,6 +360,20 @@ $alter_select = + +
+ +
+
+ +
+
+
+ +
+ + + ').hide(); + + /** Hide the brose and deleted results in the new search criteria */ + $('#buttonGo').click(function(){ + $("#table-info").hide(); + $('#browse-results').hide(); + $('#sqlqueryform').hide(); + $('#togglequerybox').hide(); + }); /** - * Prepare a div containing a link, otherwise it's incorrectly displayed + * Prepare a div containing a link for toggle the seach form, otherwise it's incorrectly displayed * after a couple of clicks */ $('
') .insertAfter('#db_search_form') - // don't show it until we have results on-screen + /** don't show it until we have results on-screen */ .hide(); + /** Changing the displayed text according to the hide/show criteria in search form*/ + $("#togglequerybox").hide(); + $("#togglequerybox").bind('click', function() { + var $link = $(this) + $('#sqlqueryform').slideToggle("medium"); + if ($link.text() == PMA_messages['strHideQueryBox']) { + $link.text(PMA_messages['strShowQueryBox']); + } else { + $link.text(PMA_messages['strHideQueryBox']); + } + /** avoid default click action */ + return false; + }) + + /** don't show it until we have results on-screen */ + + /** Changing the displayed text according to the hide/show criteria in search criteria form*/ $('#togglesearchformlink') .html(PMA_messages['strShowSearchCriteria']) .bind('click', function() { @@ -43,7 +125,7 @@ $(document).ready(function() { } else { $link.text(PMA_messages['strHideSearchCriteria']); } - // avoid default click action + /** avoid default click action */ return false; }); /** @@ -59,8 +141,8 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strSearching']); // jQuery object to reuse $form = $(this); - - // add this hidden field just once + + // add this hidden field just once if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append(''); } @@ -78,12 +160,12 @@ $(document).ready(function() { // always start with the Show message .text(PMA_messages['strShowSearchCriteria']) $('#togglesearchformdiv') - // now it's time to show the div containing the link + // now it's time to show the div containing the link .show(); } else { // error message (zero rows) $("#sqlqueryresults").html(response['message']); - } + } }) }) }, 'top.frame_content'); // end $(document).ready() diff --git a/js/messages.php b/js/messages.php index fa28771ea..c834a14c2 100644 --- a/js/messages.php +++ b/js/messages.php @@ -79,6 +79,8 @@ $js_messages['strNo'] = __('No'); /* For db_search.js */ $js_messages['strSearching'] = __('Searching'); +$js_messages['strBrowsing'] = __('Browsing'); +$js_messages['strDeleting'] = __('Deleting'); /* For sql.js */ $js_messages['strHideQueryBox'] = __('Hide query box'); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c30d7d0e0..4f8427b0a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1009,7 +1009,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence, // check for it's presence before using it - echo '
' . "\n"; + echo '
' . "\n"; if ($message instanceof PMA_Message) { if (isset($GLOBALS['special_message'])) { From efa8e3421bd786f0ba0a27b0f84280717c26a48a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Feb 2011 12:50:02 -0500 Subject: [PATCH 2/4] Deactivate these messages as we are currently in message freeze for 3.4 --- js/db_search.js | 4 ++-- js/messages.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index c581cc3c2..b391b41a3 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -20,7 +20,7 @@ function loadResult(result_path , table_name , link , ajaxEnable){ if(ajaxEnable) { /** Hides the results shown by the delete criteria */ - PMA_ajaxShowMessage(PMA_messages['strBrowsing']); + //PMA_ajaxShowMessage(PMA_messages['strBrowsing']); $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Load the browse results to the page */ @@ -55,7 +55,7 @@ function deleteResult(result_path , msg , ajaxEnable){ /** Refresh the the search results after the deletion */ document.getElementById('buttonGo'). click(); - PMA_ajaxShowMessage(PMA_messages['strDeleting']); + //PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Show the results of the deletion option */ $('#browse-results').show(); $('#sqlqueryform').show(); diff --git a/js/messages.php b/js/messages.php index c834a14c2..fc28b2ed0 100644 --- a/js/messages.php +++ b/js/messages.php @@ -79,8 +79,8 @@ $js_messages['strNo'] = __('No'); /* For db_search.js */ $js_messages['strSearching'] = __('Searching'); -$js_messages['strBrowsing'] = __('Browsing'); -$js_messages['strDeleting'] = __('Deleting'); +//$js_messages['strBrowsing'] = __('Browsing'); +//$js_messages['strDeleting'] = __('Deleting'); /* For sql.js */ $js_messages['strHideQueryBox'] = __('Hide query box'); From 8af00da90d7baf8a2c848b2e2ac850b4db031e1b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Feb 2011 12:52:04 -0500 Subject: [PATCH 3/4] ChangeLog for Ajaxify browse and delete criteria --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6ed9d74d3..a73f0fb84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,8 @@ - rfe #3148361 [interface] Replace hard coded limit with $cfg['LimitChars']. - bug #3177136 [interface] Indicate that bookmark is being used on browse. - [interface] Indicate shared bookmarks in interface. +- patch #3176420 [Search] Ajaxify browse and delete criteria in DB Search, + thanks to Thilanka Kaushalya 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, From 564d4d7d2daaef2ed3e669d0a7ee7cdd2907f2e8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Feb 2011 12:54:04 -0500 Subject: [PATCH 4/4] Typos --- js/db_search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index b391b41a3..84a3dd868 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -53,7 +53,7 @@ function deleteResult(result_path , msg , ajaxEnable){ $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); $('#togglequerybox').html(PMA_messages['strHideQueryBox']); - /** Refresh the the search results after the deletion */ + /** Refresh the search results after the deletion */ document.getElementById('buttonGo'). click(); //PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Show the results of the deletion option */ @@ -82,7 +82,7 @@ $(document).ready(function() { /** Hide the table link in the initial search result */ $("#table-info").prepend('').hide(); - /** Hide the brose and deleted results in the new search criteria */ + /** Hide the browse and deleted results in the new search criteria */ $('#buttonGo').click(function(){ $("#table-info").hide(); $('#browse-results').hide(); @@ -90,7 +90,7 @@ $(document).ready(function() { $('#togglequerybox').hide(); }); /** - * Prepare a div containing a link for toggle the seach form, otherwise it's incorrectly displayed + * Prepare a div containing a link for toggle the search form, otherwise it's incorrectly displayed * after a couple of clicks */ $('
')