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.

Sign up for GitHub

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

Jump to bottom

MBS-10381: Disallow using a work language multiple times #1559

Merged
merged 1 commit into from Jun 10, 2020
Merged

MBS-10381: Disallow using a work language multiple times #1559

merged 1 commit into from Jun 10, 2020

Conversation

reosarevok
Copy link
Member

Fix MBS-10381

While this seems to already be dropped silently on the DB level (since entering an Add work edit with the same language twice results on a work with just one language) it makes sense to not allow entering this in the first place, since it is meaningless and likely to be a user error.

On top of #1503

@reosarevok reosarevok added the Bug Bugs that should be checked/fixed soonish label Jun 8, 2020
@reosarevok reosarevok force-pushed the MBS-10381 branch 2 times, most recently from b156f13 to e415e16 Compare June 9, 2020 13:21
yvanzo
yvanzo approved these changes Jun 9, 2020
View reviewed changes
lib/MusicBrainz/Server/Form/Work.pm Outdated Show resolved Hide resolved
mwiencek
mwiencek requested changes Jun 10, 2020
View reviewed changes
Copy link
Member

@mwiencek mwiencek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works fine but it makes a little more sense to use a hash to check for uniqueness. You can rebase now that the other PR is merged too. :)

lib/MusicBrainz/Server/Form/Work.pm Outdated Show resolved Hide resolved
lib/MusicBrainz/Server/Form/Work.pm Outdated Show resolved Hide resolved
lib/MusicBrainz/Server/Form/Work.pm Outdated Show resolved Hide resolved
lib/MusicBrainz/Server/Form/Work.pm Outdated Show resolved Hide resolved
@reosarevok
MBS-10381: Disallow using a work language multiple times
a21fa61 
While this seems to already be dropped silently on the DB level
(since entering an Add work edit with the same language twice
results on a work with just one language) it makes sense to not
allow entering this in the first place, since it is meaningless and
likely to be a user error.
@reosarevok reosarevok merged commit ce8c2a2 into metabrainz:master Jun 10, 2020
@reosarevok reosarevok deleted the MBS-10381 branch June 10, 2020 19:43
yvanzo added a commit that referenced this pull request Jun 10, 2020
@yvanzo
Merge branch 'master' into beta
97841a5 
* master:
  Update POT files using the production database
  MBS-1736: Block setting format on too early releases (#1111)
  MBS-10697 / MBS-10725 / MBS-10758 / MBS-10848: Smart links (#1544)
  MBS-6864: Drop all PUID-related code (#1551)
  Eslint fixes + typographic apostrophe
  MBS-4644: Show releases that have CAA images in lists
  MBS-10873: Load ACs for annotation edits (#1541)
  MBS-6532: Show work edits in recording / release history (#1165)
  MBS-10381: Disallow using a work language multiple times (#1559)
  MBS-10892: Show private collaborated-on collections on sidebars (#1565)
  MBS-8625: release data quality icons (#1556)
  Fix invalid <div> inside <span>
  Compile static resources in the docker images
  Remove DBDefs dependency from webpack config
  Make DBDefs JS external from build
  Add DBDefs Flow defs
  Cleanup dbdefs_to_js conversion
  Remove unused variable
  MBS-10893: Document selecting artist for CD lookup (#1563)
  MBS-10890: Do not load language for works multiple times (#1562)
  Fix error message about Instagram `/explore` URLs (#1566)
  MBS-10821: Remove orphaned recordings from collections for deletion (#1512)
  MBS-10862: Report "CatNoLooksLikeLabelCode" (#1548)
  MBS-9931: Fail gracefully when trying to remove example rel
  MBS-9340: Only allow mul and zxx as the only work language
  Set cacheDirectory: true for babel-loader
  Set preset-env target to node version on server
  Bump babel-loader to 8.1.0
  Fix multiple imports on one line
  Upgrade core-js to v3 and set useBuiltIns: 'usage'
  Fix format_editnote running on localized note URL
  MBS-10186: Check for missing CD TOC on SetTrackLengths (#1511)
  Upgrade all babel deps
  Bump mutate-cow to 4.0.2
  MBS-10891: Replace Magic MP3 Tagger link with AudioRanger (#1560)
  Escape ', ", `, and GIT_MSG in GIT_MSG (#1557)
  MBS-10885: Fix error when URL has been removed (#1553)
  Eslint fixes
  MBS-10887: Fix country/date text CSS alignment (#1554)
  Refactor 435310d: Check DBDefs instead of stash (#1555)
  Fix TypeError when changing relationship type
  MBS-10856: Trim whitespace on relationship credits (#1545)
  Fix non-sanitized staging server is beta not test
  Disable IP hashes on sanitized staging server
  MBS-10836: Fix edit / remove collection links (#1550)
  Drop FUNDING file made obsolete by '.github' repo
  MBS-10882: Remove accidental duplicate push (#1547)
  Rename AddStandaloneRecordingProps and add separate props type
  $EDIT_RECORDING_CREATE artist_credit is not optional
  Fix bracket indentation
  $EDIT_RECORDING_CREATE name is not optional
  MBS-10771: Block tagging for unverified users (#1504)
  MBS-10877: Display source URLs in the relationship editor dialog
  MBS-10867: Fix "entity not in the entities array"
  MBS-10469: Add 10 minute delay to shown CAA on front page (#1540)
  Only print recording name instead of linking recording twice
  MBS-10393: Convert Add Standalone Recording edit to React
  Add react-dom libdefs from flow-typed
  Document $c-in-JS a bit more
  Enable types-first mode in Flow
  Add Flow types to AreaWithContainmentLink.js
  Add Flow types to AreaContainmentLink.js
  Add Flow types to 404.js
  Add Flow types to Footer.js
  Pass $c to all server-rendered components
  Add Flow types to ExternalLinks.js
  Bump Flow to 0.125.1
  Fix typo preventing to store alert_mtime on beta
  Add colon instead of brackets to row header
yvanzo added a commit that referenced this pull request Jun 15, 2020
@yvanzo
Merge branch 'beta' into production
c3c6348 
* beta:
  Update translations from Transifex
  Fix warning about masked variable since c1faa8b
  Update POT files using the production database
  MBS-1736: Block setting format on too early releases (#1111)
  MBS-10697 / MBS-10725 / MBS-10758 / MBS-10848: Smart links (#1544)
  MBS-6864: Drop all PUID-related code (#1551)
  Eslint fixes + typographic apostrophe
  MBS-4644: Show releases that have CAA images in lists
  MBS-10873: Load ACs for annotation edits (#1541)
  MBS-6532: Show work edits in recording / release history (#1165)
  MBS-10381: Disallow using a work language multiple times (#1559)
  MBS-10892: Show private collaborated-on collections on sidebars (#1565)
  MBS-8625: release data quality icons (#1556)
  Fix invalid <div> inside <span>
  Compile static resources in the docker images
  Remove DBDefs dependency from webpack config
  Make DBDefs JS external from build
  Add DBDefs Flow defs
  Cleanup dbdefs_to_js conversion
  Remove unused variable
  MBS-10893: Document selecting artist for CD lookup (#1563)
  MBS-10890: Do not load language for works multiple times (#1562)
  Fix error message about Instagram `/explore` URLs (#1566)
  MBS-10821: Remove orphaned recordings from collections for deletion (#1512)
  MBS-10862: Report "CatNoLooksLikeLabelCode" (#1548)
  MBS-9931: Fail gracefully when trying to remove example rel
  MBS-9340: Only allow mul and zxx as the only work language
  Set cacheDirectory: true for babel-loader
  Set preset-env target to node version on server
  Bump babel-loader to 8.1.0
  Fix multiple imports on one line
  Upgrade core-js to v3 and set useBuiltIns: 'usage'
  Fix format_editnote running on localized note URL
  MBS-10186: Check for missing CD TOC on SetTrackLengths (#1511)
  Upgrade all babel deps
  Bump mutate-cow to 4.0.2
  MBS-10891: Replace Magic MP3 Tagger link with AudioRanger (#1560)
  Escape ', ", `, and GIT_MSG in GIT_MSG (#1557)
  MBS-10885: Fix error when URL has been removed (#1553)
  Eslint fixes
  MBS-10887: Fix country/date text CSS alignment (#1554)
  Refactor 435310d: Check DBDefs instead of stash (#1555)
  Fix TypeError when changing relationship type
  MBS-10856: Trim whitespace on relationship credits (#1545)
  Fix non-sanitized staging server is beta not test
  Disable IP hashes on sanitized staging server
  MBS-10836: Fix edit / remove collection links (#1550)
  Drop FUNDING file made obsolete by '.github' repo
  MBS-10882: Remove accidental duplicate push (#1547)
  Rename AddStandaloneRecordingProps and add separate props type
  $EDIT_RECORDING_CREATE artist_credit is not optional
  Fix bracket indentation
  $EDIT_RECORDING_CREATE name is not optional
  MBS-10771: Block tagging for unverified users (#1504)
  MBS-10877: Display source URLs in the relationship editor dialog
  MBS-10867: Fix "entity not in the entities array"
  MBS-10469: Add 10 minute delay to shown CAA on front page (#1540)
  Only print recording name instead of linking recording twice
  MBS-10393: Convert Add Standalone Recording edit to React
  Add react-dom libdefs from flow-typed
  Document $c-in-JS a bit more
  Enable types-first mode in Flow
  Add Flow types to AreaWithContainmentLink.js
  Add Flow types to AreaContainmentLink.js
  Add Flow types to 404.js
  Add Flow types to Footer.js
  Pass $c to all server-rendered components
  Add Flow types to ExternalLinks.js
  Bump Flow to 0.125.1
  Fix typo preventing to store alert_mtime on beta
  Add colon instead of brackets to row header
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwiencek mwiencek mwiencek approved these changes

@yvanzo yvanzo yvanzo approved these changes

Assignees
No one assigned
Labels
Bug Bugs that should be checked/fixed soonish
Projects
None yet
Milestone
No milestone
3 participants
@reosarevok @mwiencek @yvanzo