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-04-26 23:57:10 +02:00
commit 58a133813f
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/tbl_structure.js
View File

@ -260,7 +260,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
var question = $.sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` ADD PRIMARY KEY(`' + escapeHtml(curr_column_name) + '`);');
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strAddingPrimaryKey, false);
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
$.get(url
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
, function (data) {
if (data.success === true) {
PMA_ajaxRemoveMessage($msg);
$(this).remove();
@ -278,6 +280,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
});
PMA_reloadNavigation();
}
if (data.indexes_list) {
$('.index_info').replaceWith(data.indexes_list);
}
} else {
PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
}
@ -304,7 +309,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
var question = $.sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` ADD INDEX(`' + escapeHtml(curr_column_name) + '`);');
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strAddingIndex, false);
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
$.get(url
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
, function (data) {
if (data.success === true) {
PMA_ajaxRemoveMessage($msg);
if ($('#result_query').length) {
@ -316,6 +323,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
.prependTo('#page_content');
PMA_highlightSQL($('#page_content'));
}
if (data.indexes_list) {
$('.index_info').replaceWith(data.indexes_list);
}
PMA_reloadNavigation();
} else {
PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
@ -343,7 +353,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
var question = $.sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` ADD UNIQUE(`' + escapeHtml(curr_column_name) + '`);');
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strAddingUnique, false);
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
$.get(url
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
, function (data) {
if (data.success === true) {
PMA_ajaxRemoveMessage($msg);
if ($('#result_query').length) {
@ -355,6 +367,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
.prependTo('#page_content');
PMA_highlightSQL($('#page_content'));
}
if (data.indexes_list) {
$('.index_info').replaceWith(data.indexes_list);
}
PMA_reloadNavigation();
} else {
PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);

11
libraries/sql.lib.php
View File

@ -1363,10 +1363,8 @@ function PMA_cleanupRelations($db, $table, $dropped_column, $purge, $extra_data)
&& strlen($table)
) {
PMA_relationsCleanupColumn($db, $table, $dropped_column);
if (isset($extra_data)) {
// to refresh the list of indexes (Ajax mode)
$extra_data['indexes_list'] = PMA_Index::getView($table, $db);
}
// to refresh the list of indexes (Ajax mode)
$extra_data['indexes_list'] = PMA_Index::getView($table, $db);
}
return $extra_data;
@ -1552,6 +1550,11 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil
isset($_REQUEST['purge']) ? $_REQUEST['purge'] : null,
isset($extra_data) ? $extra_data : null
);
// Update Indexes list.
if (isset($_REQUEST['index_change'])) {
$extra_data['indexes_list'] = PMA_Index::getView($table, $db);
}
}
return array($result, $num_rows, $unlim_num_rows,