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

Fix description and default value for Key and Value column #4973

Merged
merged 1 commit into from Aug 10, 2018
Merged

Fix description and default value for Key and Value column #4973

merged 1 commit into from Aug 10, 2018

Conversation

@zionio
Copy link
Contributor

@zionio zionio commented Aug 4, 2018

Fix description and default value for Key and Value column

Description

  • graylog2-web-interface/src/components/lookup-tables/adapters/DSVHTTPAdapterFieldSet.jsx

    Changed name in number in help description for

    • id="key_column"
    • id="value_column"
  • graylog2-server/src/main/java/org/graylog2/lookup/adapters/DSVHTTPDataAdapter.java

    Changed default value in public DSVHTTPDataAdapter.Config defaultConfiguration() for

    • .keyColumn(1)
    • .valueColumn(2)

Motivation and Context

Instead of CSVFileDataAdapter, which needs a name for the columns, DSVHTTPAdapterFieldSet.jsx adapter accepts only integer values, returning error in the case of strings.

In DSVHTTPDataAdapter.java the default values 1 and 2 can cause misunderstandings. The right order of the columns starts from 0, not from 1.

Screenshots (if appropriate):

gl_sshot1

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
@CLAassistant
Copy link

@CLAassistant CLAassistant commented Aug 4, 2018

CLA assistant check
All committers have signed the CLA.

@bernd bernd added this to the 3.0.0 milestone Aug 10, 2018
@bernd bernd self-assigned this Aug 10, 2018
@bernd
bernd approved these changes Aug 10, 2018
Copy link
Member

@bernd bernd left a comment

Thank you very much, good catch! 👍

@bernd bernd merged commit b41f595 into Graylog2:master Aug 10, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
dennisoelkers added a commit that referenced this pull request Oct 18, 2018
The default for key and value column should be 0 and 1 instead of 1 and 2 because the column numbering starts at 0.

(cherry picked from commit b41f595)
mpfz0r added a commit that referenced this pull request Nov 9, 2018
…5224)

The default for key and value column should be 0 and 1 instead of 1 and 2 because the column numbering starts at 0.

(cherry picked from commit b41f595)
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.

None yet

3 participants