mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-11 10:55:47 +02:00
Code Issues Releases Wiki Activity

update: common/components/RequestErrorModal

Browse Source
This commit is contained in:
Matthew Kilgore
2020-08-07 19:53:57 -04:00
committed by Franz Liedke
parent 10f4223028
commit 18148141c3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/common/Application.js
View File

@@ -377,7 +377,8 @@ export default class Application {
const isDebug = app.forum.attribute('debug'); const isDebug = app.forum.attribute('debug');
// contains a formatted errors if possible, response must be an JSON API array of errors // contains a formatted errors if possible, response must be an JSON API array of errors
// the details property is decoded to transform escaped characters such as '\n' // the details property is decoded to transform escaped characters such as '\n'
const formattedError = error.response && Array.isArray(error.response.errors) && error.response.errors.map((e) => decodeURI(e.detail)); const errors = error.response && error.response.errors;
const formattedError = Array.isArray(errors) && errors[0] && errors[0].detail && errors.map((e) => decodeURI(e.detail));
error.alert = { error.alert = {
type: 'error', type: 'error',

6
js/src/common/components/RequestErrorModal.js
View File

@@ -6,11 +6,11 @@ export default class RequestErrorModal extends Modal {
} }
title() { title() {
return this.props.error.xhr ? `${this.props.error.xhr.status} ${this.props.error.xhr.statusText}` : ''; return this.attrs.error.xhr ? `${this.attrs.error.xhr.status} ${this.attrs.error.xhr.statusText}` : '';
} }
content() { content() {
const { error, formattedError } = this.props; const { error, formattedError } = this.attrs;
let responseText; let responseText;
@@ -31,7 +31,7 @@ export default class RequestErrorModal extends Modal {
return ( return (
<div className="Modal-body"> <div className="Modal-body">
<pre> <pre>
{this.props.error.options.method} {this.props.error.options.url} {this.attrs.error.options.method} {this.attrs.error.options.url}
<br /> <br />
<br /> <br />
{responseText} {responseText}