1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00

Added table results for actions in Table maintenance in Table options

This commit is contained in:
Thilanka Kaushalya
2011-08-12 22:47:23 +05:30
parent b761f400fb
commit 6b3f10523e
2 changed files with 42 additions and 12 deletions

View File

@@ -2069,20 +2069,29 @@ $(document).ready(function() {
var $link = $(this);
var href = $link.find("a").first().attr("href");
href = href.split('?');
if ($("#sqlqueryresults").length != 0) {
$("#sqlqueryresults").remove();
}
if ($("#result_query").length != 0) {
$("#result_query").remove();
}
//variables which stores the common attributes
$.post(href[0], href[1]+"&ajax_request=true", function(data) {
if ($("#sqlqueryresults").length != 0) {
$("#sqlqueryresults").remove();
}
if ($("#result_query").length != 0) {
$("#result_query").remove();
}
if (data.success == true) {
if (data.success == undefined) {
var $temp_div = $("<div id='temp_div'></div>");
$temp_div.html(data);
var $success = $temp_div.find("#result_query .success");
PMA_ajaxShowMessage($success);
$("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
$("#sqlqueryresults").html(data);
PMA_init_slider();
$("#sqlqueryresults").children("fieldset").remove();
} else if (data.success == true ) {
PMA_ajaxShowMessage(data.message);
$("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
$("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
$("#sqlqueryresults").html(data.sql_query);
} else {
var $temp_div = $("<div id='temp_div'></div>")
var $temp_div = $("<div id='temp_div'></div>");
$temp_div.html(data.error);
var $error = $temp_div.find("code").addClass("error");
PMA_ajaxShowMessage($error);

27
sql.php
View File

@@ -867,10 +867,31 @@ else {
}
if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
echo $show_query;
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
// Gets the list of fields properties
if (isset($result) && $result) {
$fields_meta = PMA_DBI_get_fields_meta($result);
$fields_cnt = count($fields_meta);
}
if (empty($disp_mode)) {
// see the "PMA_setDisplayMode()" function in
// libraries/display_tbl.lib.php
$disp_mode = 'urdr111101';
}
// hide edit and delete links for information_schema
if ($db == 'information_schema') {
$disp_mode = 'nnnn110111';
}
$message = PMA_Message::success($message);
$extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
PMA_ajaxResponse($message,$message->isSuccess(),$extra_data);
echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
PMA_displayTable($result, $disp_mode, $analyzed_sql);
exit();
}
// Displays the headers