From 943bf8b9077656cf1812d2cb745a1dfa1a5dbf53 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 26 Mar 2015 08:28:32 +0530 Subject: [PATCH] bug Use 'server' parameter in console to work in multi server environments Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/console.js | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23eeac76dc..4538d74f26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4813 MySQL 5.7.6 and the Users menu tab - bug #4818 MySQL 5.7.6 and changing the password for another user - bug #4819 Request URI too large +- bug Use 'server' parameter in console to work in multi server environments 4.4.0.0 (not yet released) + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time diff --git a/js/console.js b/js/console.js index a2b7bd44a2..1eaaa0d736 100644 --- a/js/console.js +++ b/js/console.js @@ -860,6 +860,7 @@ var PMA_consoleMessages = { if(confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) { $.post('import.php', {token: PMA_commonParams.get('token'), + server: PMA_commonParams.get('server'), action_bookmark: 2, ajax_request: true, id_bookmark: $message.attr('bookmarkid')}, @@ -963,8 +964,11 @@ var PMA_consoleBookmarks = { } }, refresh: function () { - $.get('import.php?console_bookmark_refresh=refresh&token=' + PMA_commonParams.get('token'), - {'ajax_request': true}, + $.get('import.php', + {ajax_request: true, + token: PMA_commonParams.get('token'), + server: PMA_commonParams.get('server'), + console_bookmark_refresh: 'refresh'}, function(data) { if(data.console_message_bookmark) { $('#pma_bookmarks .content.bookmark').html(data.console_message_bookmark); @@ -1001,6 +1005,7 @@ var PMA_consoleBookmarks = { ajax_request: true, console_bookmark_add: 'true', label: $('#pma_bookmarks .card.add [name=label]').val(), + server: PMA_commonParams.get('server'), db: $('#pma_bookmarks .card.add [name=targetdb]').val(), bookmark_query: PMA_consoleInput.getText('bookmark'), shared: $('#pma_bookmarks .card.add [name=shared]').prop('checked')},