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

DD-422 posting same license error #61

Merged
merged 11 commits into from
Apr 28, 2021
Merged

DD-422 posting same license error #61

merged 11 commits into from
Apr 28, 2021

Conversation

JingMa87
Copy link

What this PR does / why we need it: It fixes the 500 error when you post the same license twice.

Which issue(s) this PR closes: DD-422

Closes #

Special notes for your reviewer: N/A

Suggestions on how to test this: Post the same license twice.

Does this PR introduce a user interface change? If mockups are available, please link/include them here: No

Is there a release notes update needed for this change?: No

Additional documentation: N/A

@janvanmansum janvanmansum changed the base branch from develop to multi-license April 7, 2021 08:28

@POST

Choose a reason for hiding this comment

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

Why is this section of code deleted? Doesn't seem to have anything to do with licenses.

@@ -936,27 +891,13 @@ public Response listBuiltinRoles() {
}
}

@DELETE

Choose a reason for hiding this comment

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

Idem.

Copy link

@janvanmansum janvanmansum left a comment

Choose a reason for hiding this comment

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

@JingMa87 : it seems you are removing some parts of the code that have nothing to do with licenses. Please, have another look.

@JingMa87
Copy link
Author

@janvanmansum I merged the branches. Also, how come there was a merge conflict in the first place?

@PaulBoon PaulBoon merged commit f670d73 into DANS-KNAW:multi-license Apr 28, 2021
PaulBoon pushed a commit to PaulBoon/dataverse that referenced this pull request Sep 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants