Commit c0b2d000 authored by Roque's avatar Roque Committed by Matevz Golob

erp5_officejs: display more error information in bootloader

parent 7f8b04aa
/*global window, rJS*/ /*global window, rJS, RSVP, Event, XMLHttpRequest*/
/*jslint nomen: true, maxlen:80, indent:2*/ /*jslint nomen: true, maxlen:80, indent:2*/
(function (window, rJS) { (function (window, rJS, RSVP, Event, XMLHttpRequest) {
"use strict"; "use strict";
function displayErrorContent(original_error) {
var error_list = [original_error],
i,
error,
error_text = "";
error_list.push(new Error('stopping ERP5JS'));
for (i = 0; i < error_list.length; i += 1) {
error = error_list[i];
if (error instanceof Event) {
error = {
string: error.toString(),
message: error.message,
type: error.type,
target: error.target
};
if (error.target !== undefined) {
error_list.splice(i + 1, 0, error.target);
}
}
if (error instanceof XMLHttpRequest) {
error = {
message: error.toString(),
readyState: error.readyState,
status: error.status,
statusText: error.statusText,
response: error.response,
responseUrl: error.responseUrl,
response_headers: error.getAllResponseHeaders()
};
}
if (error.constructor === Array ||
error.constructor === String ||
error.constructor === Object) {
try {
error = JSON.stringify(error);
} catch (ignore) {
}
}
error_text += error.message || error;
error_text += '\n';
if (error.fileName !== undefined) {
error_text += 'File: ' +
error.fileName +
': ' + error.lineNumber + '\n';
}
if (error.stack !== undefined) {
error_text += 'Stack: ' + error.stack + '\n';
}
error_text += '---\n';
}
return error_text;
}
function displayError(error) {
if (error instanceof RSVP.CancellationError) {
return "RSVP cancelation error";
}
return displayErrorContent(error);
}
rJS(window) rJS(window)
.declareMethod('render', function (options) { .declareMethod('render', function (options) {
return this.changeState(options); return this.changeState(options);
}) })
.onStateChange(function (modification_dict) { .onStateChange(function (modification_dict) {
var skip_link, error_div, app_name_div, message, var skip_link, error_div, app_name_div, message, error_text,
gadget = this; gadget = this;
if (modification_dict.app_name) { if (modification_dict.app_name) {
app_name_div = gadget.element.querySelector(".app-name"); app_name_div = gadget.element.querySelector(".app-name");
app_name_div.textContent = gadget.state.app_name + app_name_div.textContent = gadget.state.app_name +
...@@ -23,11 +82,19 @@ ...@@ -23,11 +82,19 @@
if (modification_dict.error) { if (modification_dict.error) {
error_div = gadget.element.querySelector(".error-message"); error_div = gadget.element.querySelector(".error-message");
message = "Last Error: "; message = "Last Error: ";
error_text = displayError(gadget.state.error);
if (gadget.state.error.message) { if (gadget.state.error.message) {
message += gadget.state.error.message; message += gadget.state.error.message;
} else { } else {
message += JSON.stringify(gadget.state.error); message += JSON.stringify(gadget.state.error);
} }
if (modification_dict.error.currentTarget) {
message += " - URL: " +
modification_dict.error.currentTarget.responseURL;
} else {
message += " " + modification_dict.error;
}
message += " - FULL ERROR: " + error_text;
error_div.textContent = message; error_div.textContent = message;
} }
if (modification_dict.redirect_url) { if (modification_dict.redirect_url) {
...@@ -35,5 +102,4 @@ ...@@ -35,5 +102,4 @@
skip_link.setAttribute('href', gadget.state.redirect_url); skip_link.setAttribute('href', gadget.state.redirect_url);
} }
}); });
}(window, rJS, RSVP, Event, XMLHttpRequest));
}(window, rJS)); \ No newline at end of file
\ No newline at end of file
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>vincent</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.45561.47559.9591</string> </value> <value> <string>977.20600.46420.51012</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1515751635.24</float> <float>1564070032.56</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment