OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3898 from matrix-org/jryans/extra-report-content 

Support admin configurable message when reporting content
pull/21833/head
J. Ryan Stinnett 2020-01-22 14:25:39 +00:00 committed by GitHub
parent 684974372d fbb65f068a
commit 33533646d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/dialogs/ReportEventDialog.js
View File

@ -20,6 +20,8 @@ import { _t } from '../../../languageHandler';
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {MatrixEvent} from "matrix-js-sdk"; import {MatrixEvent} from "matrix-js-sdk";
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import SdkConfig from '../../../SdkConfig';
import Markdown from '../../../Markdown';
/* /*
* A dialog for reporting an event. * A dialog for reporting an event.
@ -95,6 +97,15 @@ export default class ReportEventDialog extends PureComponent {
); );
} }
const adminMessageMD =
SdkConfig.get().reportEvent &&
SdkConfig.get().reportEvent.adminMessageMD;
let adminMessage;
if (adminMessageMD) {
const html = new Markdown(adminMessageMD).toHTML();
adminMessage = <p dangerouslySetInnerHTML={{ __html: html }} />;
}
return ( return (
<BaseDialog <BaseDialog
className="mx_BugReportDialog" className="mx_BugReportDialog"
@ -110,7 +121,7 @@ export default class ReportEventDialog extends PureComponent {
"administrator will not be able to read the message text or view any files or images.") "administrator will not be able to read the message text or view any files or images.")
} }
</p> </p>
{adminMessage}
<Field <Field
id="mx_ReportEventDialog_reason" id="mx_ReportEventDialog_reason"
className="mx_ReportEventDialog_reason" className="mx_ReportEventDialog_reason"