gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Browse Source
This commit is contained in:
Weblate 2014-02-12 14:11:02 +01:00
commit 21c5bcf676
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/rte.js
View File

@ -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);

2
libraries/rte/rte_routines.lib.php
View File

@ -1578,7 +1578,7 @@ function PMA_RTN_getExecuteForm($routine)
// Create the output
$retval = "";
$retval .= "<!-- START ROUTINE EXECUTE FORM -->\n\n";
$retval .= "<form action='db_routines.php' method='post' class='rte_form'>\n";
$retval .= "<form action='db_routines.php' method='post' class='rte_form ajax' onsubmit='return false'>\n";
$retval .= "<input type='hidden' name='item_name'\n";
$retval .= " value='{$routine['item_name']}' />\n";
$retval .= "<input type='hidden' name='item_type'\n";