diff --git a/ChangeLog b/ChangeLog index 78f05c60e8..b07e7dc0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - bug #4276 Login loop on session expiry - bug #4249 Incorrect number of result rows for SQL with subqueries - bug #4275 Broken Link to php extension manual +- bug #4053 List of procedures is not displayed after executing with Enter 4.1.7.0 (2014-02-09) - bug #4245 initial Browse query does not match sorting order diff --git a/js/rte.js b/js/rte.js index 1f3181d0fc..6527f9c737 100644 --- a/js/rte.js +++ b/js/rte.js @@ -711,6 +711,30 @@ RTE.ROUTINE = { $ajaxDialog.find('input.datefield, input.datetimefield').each(function () { PMA_addDatepicker($(this).css('width', '95%')); }); + /* + * Define the function if the user presses enter + */ + $('form.rte_form').live('submit', function (event) { + event.preventDefault(); + /** + * @var data Form data to be sent in the AJAX request + */ + var data = $(this).serialize(); + $msg = PMA_ajaxShowMessage( + PMA_messages.strProcessingRequest + ); + var url = $(this).attr('action'); + $.post(url, data, function (data) { + if (data.success === true) { + // Routine executed successfully + PMA_ajaxRemoveMessage($msg); + PMA_slidingMessage(data.message); + $ajaxDialog.remove(); + } else { + PMA_ajaxShowMessage(data.error, false); + } + }); + }); } else { // Routine executed successfully PMA_slidingMessage(data.message); diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 07eda150b4..20f148e08b 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1582,7 +1582,7 @@ function PMA_RTN_getExecuteForm($routine) // Create the output $retval = ""; $retval .= "\n\n"; - $retval .= "