Skip to content

Improve the error display on the web based updater #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2020
Merged

Improve the error display on the web based updater #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 46 additions & 10 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,10 @@ public function logVersion() {
margin: 0 auto;
}

pre {
word-wrap: break-word;
}

</style>
</head>
<body>
Expand Down Expand Up @@ -1885,7 +1889,8 @@ function performStep(number, callback) {
// it seems that this is not a JSON object
var response = {
processed: false,
response: 'Parsing response failed. ' + httpRequest.responseText
response: 'Parsing response failed.',
detailedResponseText: httpRequest.responseText,
};
callback(response);
} else {
Expand Down Expand Up @@ -1914,6 +1919,8 @@ function performStep(number, callback) {
var text = '';
if (typeof response['response'] === 'string') {
text = escapeHTML(response['response']);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response['detailedResponseText']) + '</code></pre></details>';
} else {
text = 'The following extra files have been found:<ul>';
response['response'].forEach(function(file) {
Expand All @@ -1935,6 +1942,8 @@ function performStep(number, callback) {
var text = '';
if (typeof response['response'] === 'string') {
text = escapeHTML(response['response']);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response['detailedResponseText']) + '</code></pre></details>';
} else {
text = 'The following places can not be written to:<ul>';
response['response'].forEach(function(file) {
Expand All @@ -1954,7 +1963,10 @@ function performStep(number, callback) {
errorStep('step-backup', 3);

if(response.response) {
addStepText('step-backup', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-backup', text);
}
}
},
Expand All @@ -1967,7 +1979,10 @@ function performStep(number, callback) {
errorStep('step-download', 4);

if(response.response) {
addStepText('step-download', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-download', text);
}
}
},
Expand All @@ -1980,7 +1995,10 @@ function performStep(number, callback) {
errorStep('step-verify-integrity', 5);

if(response.response) {
addStepText('step-verify-integrity', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-verify-integrity', text);
}
}
},
Expand All @@ -1993,7 +2011,10 @@ function performStep(number, callback) {
errorStep('step-extract', 6);

if(response.response) {
addStepText('step-extract', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-extract', text);
}
}
},
Expand All @@ -2006,7 +2027,10 @@ function performStep(number, callback) {
errorStep('step-enable-maintenance', 7);

if(response.response) {
addStepText('step-enable-maintenance', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-enable-maintenance', text);
}
}
},
Expand All @@ -2019,7 +2043,10 @@ function performStep(number, callback) {
errorStep('step-entrypoints', 8);

if(response.response) {
addStepText('step-entrypoints', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-entrypoints', text);
}
}
},
Expand All @@ -2032,7 +2059,10 @@ function performStep(number, callback) {
errorStep('step-delete', 9);

if(response.response) {
addStepText('step-delete', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-delete', text);
}
}
},
Expand All @@ -2049,7 +2079,10 @@ function performStep(number, callback) {
errorStep('step-move', 10);

if(response.response) {
addStepText('step-move', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-move', text);
}
}
},
Expand All @@ -2062,7 +2095,10 @@ function performStep(number, callback) {
errorStep('step-maintenance-mode', 11);

if(response.response) {
addStepText('step-maintenance-mode', escapeHTML(response.response));
var text = escapeHTML(response.response);
text += '<br><details><summary>Show detailed response</summary><pre><code>' +
escapeHTML(response.detailedResponseText) + '</code></pre></details>';
addStepText('step-maintenance-mode', text);
}
}
},
Expand Down