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

Deaccessioned dataset file edit fix. #10901

Merged
merged 10 commits into from
Oct 3, 2024
Merged

Deaccessioned dataset file edit fix. #10901

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
97a38ea
Fix Deaccessioned edition.
jp-tosca Oct 1, 2024
2aad633
Patch notes
jp-tosca Oct 1, 2024
db1a066
Added a signature of the method to receive includeDeaccessioned param
jp-tosca Oct 1, 2024
c2e1e15
Missing call to the new method
jp-tosca Oct 1, 2024
c46e0ce
Test added
jp-tosca Oct 2, 2024
2f4a84c
Typo
jp-tosca Oct 2, 2024
e57f834
Remove of clone from the API file deletion.
jp-tosca Oct 2, 2024
8accad7
Copy still needs to be created but not sent as a parameter to the com…
jp-tosca Oct 2, 2024
70a2651
File upload assertion
jp-tosca Oct 2, 2024
4e2bc1a
Update DatasetsIT.java
qqmyers Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/Dataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ public DatasetVersion getLatestVersion() {

public DatasetVersion getLatestVersionForCopy() {
for (DatasetVersion testDsv : getVersions()) {
if (testDsv.isReleased() || testDsv.isArchived()) {
if (testDsv.isReleased() || testDsv.isArchived() || testDsv.isDeaccessioned()) {
Copy link
Member

Choose a reason for hiding this comment

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

This looks like it will fix the npe problem, but this method is used in many places and I'm not sure that all of them should include a deaccessioned version. For example -

dataverse/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java

Line 152 in 4c1e069

for (FileMetadata fm : dataset.getLatestVersionForCopy().getFileMetadatas()) {
would export info about a deaccessioned version. We might need a separate getLatestPublicVersion method for such cases unless there's some other way to fix.

return testDsv;
}
}
Expand Down
Loading