From 1674e0c6c329cff191dda7eb56f10e37e39002d0 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Wed, 2 Feb 2011 07:32:55 -0500 Subject: [PATCH] Patch #3169798 Show/hide criteria on db Search --- js/db_search.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index ea7280b243..27cedd82e2 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -25,24 +25,66 @@ $(document).ready(function() { }); /** + * Prepare a div containing a link, otherwise it's incorrectly displayed + * after a couple of clicks + */ + $('
') + .insertAfter('#db_search_form') + // don't show it until we have results on-screen + .hide(); + + $('#togglesearchformlink') + .html(PMA_messages['strShowSearchCriteria']) + .bind('click', function() { + var $link = $(this); + //prompt("'"+$link.text()+"'"); + //prompt("'"+PMA_messages['strShowSearchCriteria']+"'"); + $('#db_search_form').slideToggle(); + if ($link.text() == PMA_messages['strHideSearchCriteria']) { + $link.text(PMA_messages['strShowSearchCriteria']); + } else { + $link.text(PMA_messages['strHideSearchCriteria']); + } + //var_dump(""); + // avoid default click action + return false; + }); + /** * Ajax Event handler for retrieving the result of an SQL Query * (see $GLOBALS['cfg']['AjaxEnable']) * * @uses PMA_ajaxShowMessage() */ $("#db_search_form.ajax").live('submit', function(event) { + event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strSearching']); - + // jQuery object to reuse $form = $(this); - + + // add this hidden field just once if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append(''); } - $.get($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { - $("#searchresults").html(data); - }) // end $.get() + $.post($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(response) { + if (typeof response == 'string') { + // found results + $("#searchresults").html(response); + $("#sqlqueryresults").trigger('appendAnchor'); + $('#db_search_form').hide(); + $('#togglesearchformlink') + // always start with the Show message + .text(PMA_messages['strShowSearchCriteria']) + $('#togglesearchformdiv') + // 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() -- 2.11.4.GIT