diff --git a/js/db_central_columns.js b/js/db_central_columns.js index 258eb0c884..d3ed14b752 100644 --- a/js/db_central_columns.js +++ b/js/db_central_columns.js @@ -132,7 +132,6 @@ AJAX.registerOnload('db_central_columns.js', function () { $('#tableslistcontainer').find('.checkall').show(); }); $('.edit_save_form').click(function(event) { - //alert(1); event.preventDefault(); event.stopPropagation(); var rownum = $(this).data('rownum'); @@ -142,14 +141,14 @@ AJAX.registerOnload('db_central_columns.js', function () { .attr('name', $(this).attr('name')); } }); + if($('#f_' + rownum + ' .default_type').val() === 'USER_DEFINED') { $('#f_' + rownum + ' .default_type').attr('name','col_default_sel'); } else { $('#f_' + rownum + ' .default_value').attr('name','col_default_val'); } - // alert(rownum); + var datastring = $('#f_' + rownum + ' :input').serialize(); - //console.log(datastring); $.ajax({ type: "POST", url: "db_central_columns.php", diff --git a/js/db_operations.js b/js/db_operations.js index 0a4eabd0ce..f1e7d47f18 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -135,9 +135,14 @@ AJAX.registerOnload('db_operations.js', function () { PMA_messages.strDoYouReally, 'DROP DATABASE `' + escapeHtml(PMA_commonParams.get('db') + '`') ); + var data = { + 'is_js_confirmed': '1', + 'ajax_request': true, + 'token': PMA_commonParams.get('token') + }; $(this).PMA_confirm(question, $(this).attr('href'), function (url) { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); - $.post(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) { + $.post(url, data, function (data) { if (typeof data !== 'undefined' && data.success) { //Database deleted successfully, refresh both the frames PMA_reloadNavigation(); diff --git a/js/db_search.js b/js/db_search.js index 2bde7cd9f2..c47d2c425f 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -85,7 +85,12 @@ function deleteResult(result_path, msg) var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false); /** Load the deleted option to the page*/ $('#sqlqueryform').html(''); - $.post(result_path, {'ajax_request': true, 'is_js_confirmed': true}, + var data = { + 'ajax_request': true, + 'is_js_confirmed': true, + 'token' : PMA_commonParams.get('token') + }; + $.post(result_path, data, function (data) { if (typeof data === 'undefined' || !data.success) { PMA_ajaxShowMessage(data.error, false); diff --git a/js/db_structure.js b/js/db_structure.js index 596318019c..42249f54c7 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -217,9 +217,11 @@ AJAX.registerOnload('db_structure.js', function () { if ($(this).val() === 'make_consistent_with_central_list') { event.preventDefault(); event.stopPropagation(); - jqConfirm(PMA_messages.makeConsistentMessage, function(){ - $('#tablesForm').submit(); - }); + jqConfirm( + PMA_messages.makeConsistentMessage, function(){ + $('#tablesForm').submit(); + } + ); return false; } else if ($(this).val() === 'copy_tbl' || $(this).val() === 'add_prefix_tbl' || $(this).val() === 'replace_prefix_tbl' || $(this).val() === 'copy_tbl_change_prefix') { @@ -303,6 +305,7 @@ AJAX.registerOnload('db_structure.js', function () { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); var params = getJSConfirmCommonParam(this); + params.token = PMA_commonParams.get('token'); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { @@ -366,6 +369,7 @@ AJAX.registerOnload('db_structure.js', function () { var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); var params = getJSConfirmCommonParam(this); + params.token = PMA_commonParams.get('token'); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) {