fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Show more detailed URL in AJAX error message

Browse source
This commit is contained in:
Kijin Sung 2023-12-30 22:02:24 +09:00
parent af17b34f75
commit 0e56669cc4
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/js/xml_handler.js
View file

@ -211,6 +211,7 @@
window.exec_json = $.exec_json = function(action, params, callback_success, callback_error) { window.exec_json = $.exec_json = function(action, params, callback_success, callback_error) {
// Convert params to object and fill in the module and act. // Convert params to object and fill in the module and act.
var url = XE.URI(request_uri).pathname();
var action_parts = action.split('.'); var action_parts = action.split('.');
var request_info; var request_info;
if (action === 'raw') { if (action === 'raw') {
@ -307,22 +308,22 @@
// Otherwise, display a simple alert dialog. // Otherwise, display a simple alert dialog.
if ($(".x_modal-body").size()) { if ($(".x_modal-body").size()) {
if (xhr.status == 0) { if (xhr.status == 0) {
error_info = 'Connection failed: ' + xhr.statusText + " (" + textStatus + ")" + "<br><br><pre>" + xhr.responseText + "</pre>"; error_info = 'Connection failed: ' + url + ' (' + textStatus + ')' + "<br><br><pre>" + xhr.responseText + "</pre>";
} else { } else {
error_info = xhr.status + " " + xhr.statusText + " (" + textStatus + ")" + "<br><br><pre>" + xhr.responseText + "</pre>"; error_info = xhr.status + " " + xhr.statusText + " (" + textStatus + ")" + "<br><br><pre>" + xhr.responseText + "</pre>";
} }
msg = "AJAX communication error while requesting " + params.module + "." + params.act + "<br><br>" + error_info; msg = "AJAX communication error while requesting " + (params.act ? (params.module + "." + params.act) : url) + "<br><br>" + error_info;
console.error(msg.replace(/(<br>)+/g, "\n").trim()); console.error(msg.replace(/(<br>)+/g, "\n").trim());
if (window.show_ajax_errors.indexOf('ALL') >= 0 || window.show_ajax_errors.indexOf(xhr.status) >= 0) { if (window.show_ajax_errors.indexOf('ALL') >= 0 || window.show_ajax_errors.indexOf(xhr.status) >= 0) {
alert(msg); alert(msg);
} }
} else { } else {
if (xhr.status == 0) { if (xhr.status == 0) {
error_info = 'Connection failed: ' + xhr.statusText + " (" + textStatus + ")" + "\n\n" + xhr.responseText; error_info = 'Connection failed: ' + url + ' (' + textStatus + ')' + "\n\n" + xhr.responseText;
} else { } else {
error_info = xhr.status + " " + xhr.statusText + " (" + textStatus + ")" + "\n\n" + xhr.responseText; error_info = xhr.status + " " + xhr.statusText + " (" + textStatus + ")" + "\n\n" + xhr.responseText;
} }
msg = "AJAX communication error while requesting " + params.module + "." + params.act + "\n\n" + error_info; msg = "AJAX communication error while requesting " + (params.act ? (params.module + "." + params.act) : url) + "\n\n" + error_info;
console.error(msg.trim().replace(/\n+/g, "\n")); console.error(msg.trim().replace(/\n+/g, "\n"));
if (window.show_ajax_errors.indexOf('ALL') >= 0 || window.show_ajax_errors.indexOf(xhr.status) >= 0) { if (window.show_ajax_errors.indexOf('ALL') >= 0 || window.show_ajax_errors.indexOf(xhr.status) >= 0) {
alert(msg); alert(msg);
@ -344,7 +345,7 @@
$.ajax({ $.ajax({
type: "POST", type: "POST",
dataType: "json", dataType: "json",
url: XE.URI(request_uri).pathname(), url: url,
data: params, data: params,
processData: (action !== 'raw'), processData: (action !== 'raw'),
headers : headers, headers : headers,