Merge branch 'QA_4_7'

phpmyadmin · Mar 3, 2017 · bda81b6 · bda81b6
2 parents f27b33f + f0485f6
commit bda81b6
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -98,6 +98,7 @@ phpMyAdmin - ChangeLog
 - issue #12967 Fixed related field selection for native relations
 - issue #13045 Properly escape MIME transformatoin names
 - issue #13028 Always show 100% in font selector
+- issue #13047 Fix query simulating for more servers
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

diff --git a/js/config.js b/js/config.js
@@ -798,8 +798,8 @@ function savePrefsToLocalStorage(form)
         type: 'POST',
         data: {
             ajax_request: true,
-            server: $form.find('input[name=server]').val(),
-            token: $form.find('input[name=token]').val(),
+            server: PMA_commonParams.get('server'),
+            token: PMA_commonParams.get('token'),
             submit_get_json: true
         },
         success: function (data) {
@@ -853,15 +853,17 @@ function offerPrefsAutoimport()
         if ($a.attr('href') == '#no') {
             $cnt.remove();
             $.post('index.php', {
-                token: $cnt.find('input[name=token]').val(),
+                token: PMA_commonParams.get('token'),
+                server: PMA_commonParams.get('server'),
                 prefs_autoload: 'hide'
             }, null, 'html');
             return;
         } else if ($a.attr('href') == '#delete') {
             $cnt.remove();
             localStorage.clear();
             $.post('index.php', {
-                token: $cnt.find('input[name=token]').val(),
+                token: PMA_commonParams.get('token'),
+                server: PMA_commonParams.get('server'),
                 prefs_autoload: 'hide'
             }, null, 'html');
             return;

diff --git a/js/functions.js b/js/functions.js
@@ -4222,6 +4222,7 @@ AJAX.registerOnload('functions.js', function () {
                     ? window.localStorage.favorite_tables
                     : '',
                 token: PMA_commonParams.get('token'),
+                server: PMA_commonParams.get('server'),
                 no_debug: true
             },
             success: function (data) {

diff --git a/js/indexes.js b/js/indexes.js
@@ -318,8 +318,8 @@ function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_i
     var $table = $('input[name="table"]');
     var table = $table.length > 0 ? $table.val() : '';
     var post_data = {
-        token: $('input[name="token"]').val(),
-        server:  $('input[name="server"]').val(),
+        server: PMA_commonParams.get('server'),
+        token: PMA_commonParams.get('token'),
         db: $('input[name="db"]').val(),
         table: table,
         ajax_request: 1,

diff --git a/js/navigation.js b/js/navigation.js
@@ -523,6 +523,7 @@ $(function () {
         $.ajax({
             type: 'POST',
             data: {
+                server: PMA_commonParams.get('server'),
                 token: PMA_commonParams.get('token')
             },
             url: $(this).attr('href') + '&ajax_request=true',
@@ -574,6 +575,7 @@ $(function () {
         $.ajax({
             type: 'POST',
             data: {
+                server: PMA_commonParams.get('server'),
                 token: PMA_commonParams.get('token')
             },
             url: $(this).attr('href') + '&ajax_request=true',
@@ -610,6 +612,7 @@ $(function () {
                 favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined')
                     ? window.localStorage.favorite_tables
                     : '',
+                server: PMA_commonParams.get('server'),
                 token: PMA_commonParams.get('token')
             },
             success: function (data) {
@@ -942,6 +945,7 @@ function PMA_ensureNaviSettings(selflink) {
     if (!$('#pma_navigation_settings').length) {
         var params = {
             getNaviSettings: true,
+            server: PMA_commonParams.get('server'),
             token: PMA_commonParams.get('token')
         };
         var url = $('#pma_navigation').find('a.navigation_url').attr('href');
@@ -973,6 +977,7 @@ function PMA_reloadNavigation(callback, paths) {
     var params = {
         reload: true,
         no_debug: true,
+        server: PMA_commonParams.get('server'),
         token: PMA_commonParams.get('token')
     };
     paths = paths || traverseNavigationForPaths();

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
@@ -1350,6 +1350,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             chart_data: 1,
             type: 'chartgrid',
             requiredData: JSON.stringify(runtime.dataList),
+            server: PMA_commonParams.get('server'),
             token: PMA_commonParams.get('token')
         }, function (data) {
             var chartData;
@@ -1983,6 +1984,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             query_analyzer: true,
             query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),
             database: db,
+            server: PMA_commonParams.get('server'),
             token: PMA_commonParams.get('token')
         }, function (data) {
             var i, l;

diff --git a/js/sql.js b/js/sql.js
@@ -585,7 +585,8 @@ AJAX.registerOnload('sql.js', function () {
             type: 'POST',
             url: $form.attr('action'),
             data: {
-                token: $form.find('input[name="token"]').val(),
+                token: PMA_commonParams.get('token'),
+                server: PMA_commonParams.get('server'),
                 db: db_name,
                 ajax_request: '1',
                 simulate_dml: '1',

diff --git a/js/tbl_operations.js b/js/tbl_operations.js
@@ -137,6 +137,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
         //variables which stores the common attributes
         var params = {
             ajax_request: 1,
+            server: PMA_commonParams.get('server'),
             token: PMA_commonParams.get('token')
         };
         $.post($(this).attr('href'), params, function (data) {

diff --git a/js/tbl_select.js b/js/tbl_select.js
@@ -301,7 +301,8 @@ AJAX.registerOnload('tbl_select.js', function () {
                 url: 'tbl_select.php',
                 type: 'POST',
                 data: {
-                    token: $('input[name="token"]').val(),
+                    server: PMA_commonParams.get('server'),
+                    token: PMA_commonParams.get('token'),
                     ajax_request: 1,
                     db: $('input[name="db"]').val(),
                     table: $('input[name="table"]').val(),