Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
This commit is contained in:
commit
01c7f4e3f1
@ -732,7 +732,7 @@ function savePrefsToLocalStorage(form)
|
||||
submit_get_json: true
|
||||
},
|
||||
success: function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
window.localStorage['config'] = data.prefs;
|
||||
window.localStorage['config_mtime'] = data.mtime;
|
||||
window.localStorage['config_mtime_local'] = (new Date()).toUTCString();
|
||||
|
||||
@ -52,7 +52,7 @@ AJAX.registerOnload('db_operations.js', function () {
|
||||
$form.PMA_confirm(question, $form.attr('action'), function (url) {
|
||||
PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false);
|
||||
$.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
PMA_commonParams.set('db', data.newname);
|
||||
|
||||
@ -86,7 +86,7 @@ AJAX.registerOnload('db_operations.js', function () {
|
||||
$.get($form.attr('action'), $form.serialize(), function (data) {
|
||||
// use messages that stay on screen
|
||||
$('div.success, div.error').fadeOut();
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
if ($("#checkbox_switch").is(":checked")) {
|
||||
PMA_commonParams.set('db', data.newname);
|
||||
PMA_commonActions.refreshMain(false, function () {
|
||||
@ -112,7 +112,7 @@ AJAX.registerOnload('db_operations.js', function () {
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
PMA_ajaxShowMessage(PMA_messages.strChangingCharset);
|
||||
$.get($form.attr('action'), $form.serialize() + "&submitcollation=1", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error, false);
|
||||
|
||||
@ -46,7 +46,7 @@ function loadResult(result_path, table_name, link)
|
||||
$('#table-link').attr({"href" : 'sql.php?' + link }).text(table_name);
|
||||
var url = result_path + "#sqlqueryresults";
|
||||
$.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
$('#browse-results').html(data.message);
|
||||
$('html, body')
|
||||
.animate({
|
||||
@ -85,7 +85,7 @@ function deleteResult(result_path, msg)
|
||||
var url = result_path + "#result_query, #sqlqueryform";
|
||||
$.get(url, {'ajax_request': true, 'is_js_confirmed': true},
|
||||
function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
$('#sqlqueryform').html(data.sql_query);
|
||||
/** Refresh the search results after the deletion */
|
||||
document.getElementById('buttonGo').click();
|
||||
@ -202,7 +202,7 @@ AJAX.registerOnload('db_search.js', function () {
|
||||
|
||||
var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val();
|
||||
$.post($form.attr('action'), url, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
// found results
|
||||
$("#searchresults").html(data.message);
|
||||
|
||||
|
||||
@ -206,7 +206,7 @@ AJAX.registerOnload('db_structure.js', function () {
|
||||
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
|
||||
|
||||
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
// Adjust table statistics
|
||||
var $tr = $this_anchor.closest('tr');
|
||||
@ -266,7 +266,7 @@ AJAX.registerOnload('db_structure.js', function () {
|
||||
var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
|
||||
|
||||
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
toggleRowColors($curr_row.next());
|
||||
$curr_row.hide("medium").remove();
|
||||
@ -302,7 +302,7 @@ AJAX.registerOnload('db_structure.js', function () {
|
||||
PMA_ajaxShowMessage(PMA_messages.strDeletingTrackingData);
|
||||
|
||||
$.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $tracked_table = $curr_tracking_row.parents('table');
|
||||
var table_name = $curr_tracking_row.find('td:nth-child(2)').text();
|
||||
|
||||
|
||||
@ -170,7 +170,7 @@ function PMA_display_git_revision()
|
||||
"ajax_request": true
|
||||
},
|
||||
function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$(data.message).insertAfter('#li_pma_version');
|
||||
}
|
||||
}
|
||||
@ -2167,7 +2167,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
//User wants to submit the form
|
||||
$.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#properties_message')
|
||||
.removeClass('error')
|
||||
.html('');
|
||||
@ -2248,7 +2248,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
|
||||
//User wants to add more fields to the table
|
||||
$.post($form.attr('action'), $form.serialize() + "&submit_num_fields=1", function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
$("#page_content").html(data.message);
|
||||
PMA_highlightSQL($('#page_content'));
|
||||
PMA_verifyColumnsProperties();
|
||||
@ -2294,7 +2294,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
var $form = $(this);
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
$.post($form.attr('action'), $form.serialize() + "&submit_copy=Go", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
if ($form.find("input[name='switch_to_new']").prop('checked')) {
|
||||
PMA_commonParams.set(
|
||||
'db',
|
||||
@ -2328,7 +2328,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
var tbl = $form.find('input[name=new_name]').val();
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
$.post($form.attr('action'), $form.serialize() + "&submit_move=1", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_commonParams.set('db', db);
|
||||
PMA_commonParams.set('table', tbl);
|
||||
PMA_commonActions.refreshMain(false, function () {
|
||||
@ -2355,7 +2355,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
var tbl = $tblNameField.val();
|
||||
$.post($form.attr('action'), $form.serialize(), function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_commonParams.set('table', tbl);
|
||||
PMA_commonActions.refreshMain(false, function () {
|
||||
$('#page_content').html(data.message);
|
||||
@ -2386,13 +2386,13 @@ AJAX.registerOnload('functions.js', function () {
|
||||
function scrollToTop() {
|
||||
$('html, body').animate({ scrollTop: 0 });
|
||||
}
|
||||
if (data.success === true && data.sql_query !== undefined) {
|
||||
if (typeof data !== 'undefined' && data.success === true && data.sql_query !== undefined) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
$("<div id='sqlqueryresults' class='ajax'></div>").prependTo("#page_content");
|
||||
$("#sqlqueryresults").html(data.sql_query);
|
||||
PMA_highlightSQL($('#page_content'));
|
||||
scrollToTop();
|
||||
} else if (data.success === true) {
|
||||
} else if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $temp_div = $("<div id='temp_div'></div>");
|
||||
$temp_div.html(data.message);
|
||||
var $success = $temp_div.find("#result_query .success");
|
||||
@ -2437,7 +2437,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
|
||||
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
|
||||
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
//Database deleted successfully, refresh both the frames
|
||||
PMA_reloadNavigation();
|
||||
PMA_commonParams.set('db', '');
|
||||
@ -2542,7 +2542,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
$the_form.append('<input type="hidden" name="ajax_request" value="true" />');
|
||||
|
||||
$.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$("#page_content").prepend(data.message);
|
||||
PMA_highlightSQL($('#page_content'));
|
||||
$("#change_password_dialog").hide().remove();
|
||||
@ -2559,7 +2559,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
$(this).dialog('close');
|
||||
};
|
||||
$.get($(this).attr('href'), {'ajax_request': true}, function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
$('<div id="change_password_dialog"></div>')
|
||||
.dialog({
|
||||
title: PMA_messages.strChangePassword,
|
||||
@ -2948,7 +2948,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
|
||||
if ($("#sqlqueryresults").length !== 0) {
|
||||
$("#sqlqueryresults").remove();
|
||||
}
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
if ($('#result_query').length) {
|
||||
$('#result_query').remove();
|
||||
@ -2993,7 +2993,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
|
||||
};
|
||||
var $msgbox = PMA_ajaxShowMessage();
|
||||
$.get("tbl_indexes.php", url, function (data) {
|
||||
if (data.success === false) {
|
||||
if (typeof data !== 'undefined' && data.success === false) {
|
||||
//in the case of an error, show the error message returned.
|
||||
PMA_ajaxShowMessage(data.error, false);
|
||||
} else {
|
||||
@ -3211,7 +3211,7 @@ var toggleButton = function ($obj) {
|
||||
addClass = 'on';
|
||||
}
|
||||
$.post(url, {'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
$container
|
||||
.removeClass(removeClass)
|
||||
@ -3359,7 +3359,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
$.get(
|
||||
$('#update_recent_tables').attr('href'),
|
||||
function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#pma_recent_list').html(data.list);
|
||||
}
|
||||
}
|
||||
@ -3559,7 +3559,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
|
||||
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
|
||||
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
// Table deleted successfully, refresh both the frames
|
||||
PMA_reloadNavigation();
|
||||
@ -3592,7 +3592,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
|
||||
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
|
||||
$.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
// Table deleted successfully, refresh both the frames
|
||||
PMA_reloadNavigation();
|
||||
@ -3629,7 +3629,7 @@ AJAX.registerOnload('functions.js', function () {
|
||||
if ($("#result_query").length !== 0) {
|
||||
$("#result_query").remove();
|
||||
}
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
$("<div id='sqlqueryresults'></div>").prependTo("#page_content");
|
||||
$("#sqlqueryresults").html(data.sql_query);
|
||||
@ -3916,7 +3916,7 @@ function PMA_createViewDialog($this)
|
||||
var $msg = PMA_ajaxShowMessage();
|
||||
var syntaxHighlighter = null;
|
||||
$.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
var buttonOptions = {};
|
||||
buttonOptions[PMA_messages.strGo] = function () {
|
||||
@ -3926,7 +3926,7 @@ function PMA_createViewDialog($this)
|
||||
$msg = PMA_ajaxShowMessage();
|
||||
$.get('view_create.php', $('#createViewDialog').find('form').serialize(), function (data) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#createViewDialog').dialog("close");
|
||||
$('#result_query').html(data.message);
|
||||
PMA_reloadNavigation();
|
||||
|
||||
@ -147,7 +147,7 @@ function loadGISEditor(value, field, type, input_name, token) {
|
||||
'token' : token,
|
||||
'ajax_request': true
|
||||
}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$gis_editor.html(data.gis_editor);
|
||||
initGISEditorVisualization();
|
||||
prepareJSVersion();
|
||||
@ -197,7 +197,7 @@ function insertDataAndClose() {
|
||||
var input_name = $form.find("input[name='input_name']").val();
|
||||
|
||||
$.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$("input[name='" + input_name + "']").val(data.result);
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error, false);
|
||||
@ -248,7 +248,7 @@ AJAX.registerOnload('gis_data_editor.js', function () {
|
||||
$('#gis_editor').find("input[type='text']").live('change', function () {
|
||||
var $form = $('form#gis_data_editor_form');
|
||||
$.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#gis_data_textarea').val(data.result);
|
||||
$('#placeholder').empty().removeClass('hasSVG').html(data.visualization);
|
||||
$('#openlayersmap').empty();
|
||||
@ -269,7 +269,7 @@ AJAX.registerOnload('gis_data_editor.js', function () {
|
||||
var $form = $('form#gis_data_editor_form');
|
||||
|
||||
$.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true&ajax_request=true", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$gis_editor.html(data.gis_editor);
|
||||
initGISEditorVisualization();
|
||||
prepareJSVersion();
|
||||
|
||||
@ -135,7 +135,7 @@ AJAX.registerOnload('indexes.js', function () {
|
||||
$anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
|
||||
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
|
||||
$.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
var $table_ref = $rows_to_hide.closest('table');
|
||||
if ($rows_to_hide.length == $table_ref.find('tbody > tr').length) {
|
||||
|
||||
@ -952,7 +952,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
}, function (data) {
|
||||
g.lastXHR = null;
|
||||
$editArea.removeClass('edit_area_loading');
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
if ($td.is('.truncated')) {
|
||||
// get the truncated data length
|
||||
g.maxTruncatedLen = $(g.currentEditCell).text().length - 3;
|
||||
@ -1244,7 +1244,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
|
||||
$('div.save_edited').removeClass('saving_edited_data')
|
||||
.find('input').removeProp('disabled'); // enable the save button back
|
||||
}
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
|
||||
// update where_clause related data in each edited row
|
||||
|
||||
@ -177,7 +177,7 @@ $(function () {
|
||||
$.ajax({
|
||||
url: $(this).attr('href') + '&ajax_request=true',
|
||||
success: function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_reloadNavigation();
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error);
|
||||
@ -191,7 +191,7 @@ $(function () {
|
||||
event.preventDefault();
|
||||
var $msg = PMA_ajaxShowMessage();
|
||||
$.get($(this).attr('href') + '&ajax_request=1', function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
var buttonOptions = {};
|
||||
buttonOptions[PMA_messages.strClose] = function () {
|
||||
@ -225,7 +225,7 @@ $(function () {
|
||||
url: $(this).attr('href') + '&ajax_request=true',
|
||||
success: function (data) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$tr.remove();
|
||||
PMA_reloadNavigation();
|
||||
} else {
|
||||
@ -310,7 +310,7 @@ function expandTreeNode($expandElem, callback) {
|
||||
$throbber.insertBefore($icon);
|
||||
|
||||
loadChildNodes($expandElem, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $destination = $expandElem.closest('li');
|
||||
$icon.removeClass('ic_b_plus').addClass('ic_b_minus');
|
||||
$destination
|
||||
@ -406,7 +406,7 @@ function loadChildNodes($expandElem, callback) {
|
||||
|
||||
var url = $('#pma_navigation').find('a.navigation_url').attr('href');
|
||||
$.get(url, params, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$expandElem.addClass('loaded');
|
||||
$destination.find('div.list_container').remove(); // FIXME: Hack, there shouldn't be a list container there
|
||||
$destination.append(data.message);
|
||||
@ -638,7 +638,7 @@ function PMA_reloadNavigation(callback) {
|
||||
});
|
||||
var url = $('#pma_navigation').find('a.navigation_url').attr('href');
|
||||
$.post(url, params, function (data) {
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
$('#pma_navigation_tree').html(data.message).children('div').show();
|
||||
PMA_showCurrentNavigation();
|
||||
// Fire the callback, if any
|
||||
@ -686,7 +686,7 @@ function PMA_navigationTreePagination($this) {
|
||||
}
|
||||
$.post(url, params, function (data) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
if (isDbSelector) {
|
||||
var val = PMA_fastFilter.getSearchClause();
|
||||
$('#pma_navigation_tree')
|
||||
|
||||
@ -64,7 +64,7 @@ AJAX.registerOnload('server_databases.js', function () {
|
||||
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false);
|
||||
|
||||
$.post(url, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
|
||||
var $rowsToRemove = $form.find('tr.removeMe');
|
||||
@ -109,7 +109,7 @@ AJAX.registerOnload('server_databases.js', function () {
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
|
||||
$.post($form.attr('action'), $form.serialize(), function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
|
||||
//Append database's row to table
|
||||
|
||||
@ -113,7 +113,7 @@ function addUser($form)
|
||||
|
||||
//We also need to post the value of the submit button in order to get this to work correctly
|
||||
$.post($form.attr('action'), $form.serialize() + "&adduser_submit=" + $("input[name=adduser_submit]").val(), function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
// Refresh navigation, if we created a database with the name
|
||||
// that is the same as the username of the new user
|
||||
if ($('#add_user_dialog #createdb-1:checked').length) {
|
||||
@ -248,7 +248,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
var $msgbox = PMA_ajaxShowMessage();
|
||||
|
||||
$.get($(this).attr("href"), {'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#page_content').hide();
|
||||
var $div = $('#add_user_dialog');
|
||||
if ($div.length === 0) {
|
||||
@ -302,7 +302,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
var $form = $("#usersForm");
|
||||
|
||||
$.post($form.attr('action'), $form.serialize() + "&delete=" + $(this).val() + "&ajax_request=true", function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxShowMessage(data.message);
|
||||
// Refresh navigation, if we droppped some databases with the name
|
||||
// that is the same as the username of the deleted user
|
||||
@ -349,7 +349,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
'token': token
|
||||
},
|
||||
function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
var buttonOptions = {};
|
||||
buttonOptions[PMA_messages.strGo] = function () {
|
||||
@ -362,7 +362,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
$('#changeUserGroupDialog').find('form').serialize() + '&ajax_request=1',
|
||||
function (data) {
|
||||
PMA_ajaxRemoveMessage($message);
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$("#usersForm")
|
||||
.find('.current_row')
|
||||
.removeClass('current_row')
|
||||
@ -434,7 +434,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
'token': token
|
||||
},
|
||||
function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#page_content').hide();
|
||||
var $div = $('#edit_user_dialog');
|
||||
if ($div.length === 0) {
|
||||
@ -509,7 +509,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
}
|
||||
|
||||
$.post($t.attr('action'), $t.serialize() + '&' + curr_submit_name + '=' + curr_submit_value, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#page_content').show();
|
||||
$("#edit_user_dialog").remove();
|
||||
|
||||
@ -591,7 +591,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
$(this.form).prop('action'),
|
||||
$(this.form).serialize() + '&submit_mult=export&ajax_request=true',
|
||||
function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $ajaxDialog = $('<div />')
|
||||
.append(data.message)
|
||||
.dialog({
|
||||
@ -647,7 +647,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
$.get($(this).attr('href'), {'ajax_request': true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $ajaxDialog = $('<div />')
|
||||
.append(data.message)
|
||||
.dialog({
|
||||
@ -689,7 +689,7 @@ AJAX.registerOnload('server_privileges.js', function () {
|
||||
event.preventDefault();
|
||||
var $msgbox = PMA_ajaxShowMessage();
|
||||
$.get($(this).attr('href'), {'ajax_request' : true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
// This form is not on screen when first entering Privileges
|
||||
// if there are more than 50 users
|
||||
|
||||
@ -695,7 +695,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
$.get('server_status_monitor.php?' + PMA_commonParams.get('common_query'), vars,
|
||||
function (data) {
|
||||
var logVars;
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
logVars = data.message;
|
||||
} else {
|
||||
return serverResponseError();
|
||||
@ -1350,7 +1350,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
requiredData: JSON.stringify(runtime.dataList)
|
||||
}, function (data) {
|
||||
var chartData;
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
chartData = data.message;
|
||||
} else {
|
||||
return serverResponseError();
|
||||
@ -1594,7 +1594,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
function (data) {
|
||||
var logData;
|
||||
var dlgBtns = {};
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
logData = data.message;
|
||||
} else {
|
||||
return serverResponseError();
|
||||
@ -1981,7 +1981,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
|
||||
database: db
|
||||
}, function (data) {
|
||||
var i;
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
data = data.message;
|
||||
}
|
||||
if (data.error) {
|
||||
|
||||
@ -123,7 +123,7 @@ AJAX.registerOnload('server_variables.js', function () {
|
||||
type: 'getval',
|
||||
varName: varName
|
||||
}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
var $editor = $('<div />', {'class': 'serverVariableEditor'})
|
||||
.append($myCancelLink)
|
||||
.append(' ')
|
||||
|
||||
@ -330,7 +330,7 @@ $("#tblchartform").live('submit', function (event) {
|
||||
PMA_prepareForAjaxRequest($form);
|
||||
|
||||
$.post($form.attr('action'), $form.serialize(), function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('.success').fadeOut();
|
||||
if (typeof data.chartData != 'undefined') {
|
||||
chart_data = jQuery.parseJSON(data.chartData);
|
||||
|
||||
@ -86,7 +86,7 @@ function getDropdownValues($dropdown) {
|
||||
datatype: 'json',
|
||||
success: function (data) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
if (data.success) {
|
||||
if (typeof data !== 'undefined' && data.success) {
|
||||
// if the changed dropdown is a database selector
|
||||
if (foreignTable === null) {
|
||||
// set values for table and column dropdowns
|
||||
|
||||
@ -106,7 +106,7 @@ AJAX.registerOnload('tbl_select.js', function () {
|
||||
|
||||
$.post($search_form.attr('action'), values, function (data) {
|
||||
PMA_ajaxRemoveMessage($msgbox);
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
if (typeof data.sql_query !== 'undefined') { // zero rows
|
||||
$("#sqlqueryresults").html(data.sql_query);
|
||||
} else { // results found
|
||||
|
||||
@ -210,7 +210,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
$(this).PMA_confirm(question, $(this).attr('href'), function (url) {
|
||||
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false);
|
||||
$.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true, 'ajax_page_request' : true}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
if ($('#result_query').length) {
|
||||
$('#result_query').remove();
|
||||
@ -265,7 +265,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
$.get(url
|
||||
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
|
||||
, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
$(this).remove();
|
||||
if (typeof data.reload != 'undefined') {
|
||||
@ -314,7 +314,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
$.get(url
|
||||
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
|
||||
, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
if ($('#result_query').length) {
|
||||
$('#result_query').remove();
|
||||
@ -358,7 +358,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
$.get(url
|
||||
, {'is_js_confirmed' : 1, 'ajax_request' : true, 'index_change' : true}
|
||||
, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
if ($('#result_query').length) {
|
||||
$('#result_query').remove();
|
||||
|
||||
@ -396,7 +396,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
|
||||
'sql_query' : sql_query,
|
||||
'inline_edit' : false
|
||||
}, function (data) {
|
||||
if (data.success === true) {
|
||||
if (typeof data !== 'undefined' && data.success === true) {
|
||||
$('#sqlqueryresults').html(data.sql_query);
|
||||
$("#sqlqueryresults").trigger('appendAnchor');
|
||||
} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user