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

Merge pull request #3207 from matrix-org/travis/rageshake-required 

Require an issue URL (or notes) on rageshakes
pull/21833/head
Travis Ralston 2019-07-11 13:01:38 -06:00 committed by GitHub
parent 111b28971a c89a864a82
commit 0950037ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/views/dialogs/BugReportDialog.js
View File

@ -50,6 +50,13 @@ export default class BugReportDialog extends React.Component {
} }
_onSubmit(ev) { _onSubmit(ev) {
if ((!this.state.text || !this.state.text.trim()) && (!this.state.issueUrl || !this.state.issueUrl.trim())) {
this.setState({
err: _t("Please tell us what went wrong or, better, a github issue that describes the problem."),
});
return;
}
const userText = const userText =
(this.state.text.length > 0 ? this.state.text + '\n\n': '') + 'Issue: ' + (this.state.text.length > 0 ? this.state.text + '\n\n': '') + 'Issue: ' +
(this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given'); (this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given');
@ -93,7 +100,7 @@ export default class BugReportDialog extends React.Component {
this.setState({ issueUrl: ev.target.value }); this.setState({ issueUrl: ev.target.value });
} }
_onSendLogsChange(ev) { _onSendLogsChange(ev) {
this.setState({ sendLogs: ev.target.checked }); this.setState({ sendLogs: ev.target.checked });
} }

1
src/i18n/strings/en_EN.json
View File

@ -1108,6 +1108,7 @@
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?", "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
"Invite anyway and never warn me again": "Invite anyway and never warn me again", "Invite anyway and never warn me again": "Invite anyway and never warn me again",
"Invite anyway": "Invite anyway", "Invite anyway": "Invite anyway",
"Please tell us what went wrong or, better, a github issue that describes the problem.": "Please tell us what went wrong or, better, a github issue that describes the problem.",
"Preparing to send logs": "Preparing to send logs", "Preparing to send logs": "Preparing to send logs",
"Logs sent": "Logs sent", "Logs sent": "Logs sent",
"Thank you!": "Thank you!", "Thank you!": "Thank you!",