Skip to content

remove file from folders if we are moving it into the same dataset #442

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

remove file from folders if we are moving it into the same dataset #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1de29c2
remove file from folders if we are moving it into the same dataset
tcnichol Mar 20, 2024
a4ae13d
duplicate line
tcnichol Mar 22, 2024
4bde973
fixing the iteration
tcnichol Mar 22, 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
8 changes: 8 additions & 0 deletions app/api/Datasets.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,15 @@ class Datasets @Inject()(
}
Logger.debug("----- Adding file to dataset completed")
} else {
val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name)
Logger.debug("File was already in dataset.")
Logger.debug("Remove file from folders in dataset")
foldersContainingFile.foreach(folder => {
if (folder.parentDatasetId == dsId){
folders.removeFile(folder.id, fileId)

}
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:

# main clowder application
clowder:
image: clowder/clowder:${CLOWDER_VERSION:-latest}
image: clowder:bugfix
restart: unless-stopped
networks:
- clowder
Expand Down