Obey the ShowSQL directive also for inline edit

NenadGajic · Mar 26, 2011 · bb3f6af · bb3f6af
1 parent e4bdbc2
commit bb3f6af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/js/sql.js b/js/sql.js
@@ -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);

diff --git a/sql.php b/sql.php
@@ -709,8 +709,8 @@
             }
         }
 
-        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;

diff --git a/tbl_replace.php b/tbl_replace.php
@@ -326,9 +326,11 @@
     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);