Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-03-26 05:58:32 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-03-26 05:58:32 +0300
commit943bf8b9077656cf1812d2cb745a1dfa1a5dbf53 (patch)
tree3aaee7f07e19a62c9ec6be17f1ae68c617df6bc5 /js/console.js
parenta6810ece96ec0a9c65c787f9fecc7b7c7727c585 (diff)
bug Use 'server' parameter in console to work in multi server environments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/console.js')
-rw-r--r--js/console.js9
1 files changed, 7 insertions, 2 deletions
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')},