Obey the ShowSQL directive also for inline edit
This commit is contained in:
@@ -891,6 +891,13 @@ $(document).ready(function() {
|
||||
$.post('tbl_replace.php', post_params, function(data) {
|
||||
if(data.success == true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
// remove possible previous feedback message
|
||||
$('#result_query').remove();
|
||||
if (typeof data.result_query != 'undefined') {
|
||||
// display feedback
|
||||
$('#sqlqueryresults').prepend('<div id="result_query" align="left"></div>');
|
||||
$('#result_query').prepend(data.result_query);
|
||||
}
|
||||
PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data, disp_mode);
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error);
|
||||
|
4
sql.php
4
sql.php
@@ -709,8 +709,8 @@ if (0 == $num_rows || $is_affected) {
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($GLOBALS['display_query'])) {
|
||||
$extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
|
||||
if ($cfg['ShowSQL']) {
|
||||
$extra_data['result_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
|
||||
}
|
||||
if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) {
|
||||
$extra_data['reload'] = 1;
|
||||
|
@@ -326,9 +326,11 @@ if ($is_insert && count($value_sets) > 0) {
|
||||
unset($query_fields);
|
||||
} elseif (empty($query)) {
|
||||
// No change -> move back to the calling script
|
||||
//
|
||||
// Note: logic passes here for inline edit
|
||||
$message = PMA_Message::success(__('No change'));
|
||||
$active_page = $goto_include;
|
||||
if(!$GLOBALS['is_ajax_request'] == true) {
|
||||
if(! $GLOBALS['is_ajax_request'] == true) {
|
||||
require_once './libraries/header.inc.php';
|
||||
}
|
||||
require './' . PMA_securePath($goto_include);
|
||||
|
Reference in New Issue
Block a user