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

Make InputListItem reuse ConfigurationWell, so passwords are masked. #2203

Merged
merged 2 commits into from May 10, 2016

Conversation

Projects
None yet
2 participants
@dennisoelkers
Member

dennisoelkers commented May 9, 2016

Before this change, the InputListItem component was creating the configuration list on its own, so passwords were not masked.

Fixes #2198.

@dennisoelkers dennisoelkers added the bug label May 9, 2016

@dennisoelkers dennisoelkers added this to the 2.0.1 milestone May 9, 2016

@edmundoa edmundoa self-assigned this May 10, 2016

titleValue={input.title}
typeName={input.type} includeTitleField
submitAction={this._updateInput} values={input.attributes} /> : null;
const additionalContent = (
<div>
<Col md={8}>
<Well bsSize="small" className="configuration-well">
<ul>
{this._getConfigurationOptions(this.props.input.attributes)}

This comment has been minimized.

@edmundoa

edmundoa May 10, 2016

Member

We should also remove the _getConfigurationOptions method, as it is not used any more.

This comment has been minimized.

@dennisoelkers
@edmundoa

This comment has been minimized.

Member

edmundoa commented May 10, 2016

Other than the clean-up remark, it looks good to me! 👍

@edmundoa edmundoa merged commit 2394efc into 2.0 May 10, 2016

4 checks passed

ci-server-integration Jenkins build graylog2-server-integration-pr 897 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 385 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@edmundoa

This comment has been minimized.

Member

edmundoa commented May 10, 2016

Looking good! :shipit:

@edmundoa edmundoa deleted the issue-2198 branch May 10, 2016

edmundoa added a commit that referenced this pull request May 10, 2016

Make InputListItem reuse ConfigurationWell, so passwords are masked. (#…
…2203)

* Make InputListItem reuse ConfigurationWell, so passwords are masked.

Fixes #2198.

* Removing obsolete function.

(cherry picked from commit 2394efc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment