Skip to content
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.

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

do not allow testing a message against the default stream #3377

Merged
merged 3 commits into from Jan 17, 2017
Merged

Conversation

@kroepke
Copy link
Member

@kroepke kroepke commented Jan 17, 2017

  • the default stream is disabled in the menu and has a title explaining that it cannot be used (as title for hover)
  • going to /streams/000000000000000000000001/edit now displays an error message (this page should not be reachable other than manually via that path)

fixes #3369

 * the default stream is disabled in the menu and has a title explaining that it cannot be used (as title for hover)
 * going to /streams/000000000000000000000001/edit now displays an error message (this page should not be reachable other than manually via that path)

fixes #3369
@kroepke kroepke added this to the 2.2.0 milestone Jan 17, 2017
@edmundoa edmundoa self-assigned this Jan 17, 2017
Copy link
Member

@edmundoa edmundoa left a comment

Other than the style problems the changes look good to me and solve the issue.

);
if (stream.is_default) {
streamList.push(
<MenuItem key={stream.id} disabled={true} title="Cannot test against the default stream">{stream.title}</MenuItem>

This comment has been minimized.

@edmundoa

edmundoa Jan 17, 2017
Member

Minor nitpick: this breaks the react/jsx-boolean-value style rule. You can just type disabled and the value passed to the component will be true, no need to assign the value

@@ -30,6 +31,19 @@ const StreamEditPage = React.createClass({
return <Spinner />;
}

let content = <StreamRulesEditor currentUser={this.state.currentUser} streamId={this.props.params.streamId}

This comment has been minimized.

@edmundoa

edmundoa Jan 17, 2017
Member

Minor nitpick: this breaks the react/wrap-multilines style rule.

@kroepke
Copy link
Member Author

@kroepke kroepke commented Jan 17, 2017

double linting

Copy link
Member

@edmundoa edmundoa left a comment

LGTM 👍

@edmundoa edmundoa merged commit a629345 into master Jan 17, 2017
1 of 4 checks passed
1 of 4 checks passed
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 1295 is running
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
licence/cla Contributor License Agreement is signed.
Details
@edmundoa edmundoa deleted the issue-3369 branch Jan 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants