Skip to content

GitHub Issue 1446: Scope delete-data confirmation to current folder #8093

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

Merged
cnathe merged 3 commits into from
Sep 25, 2026
Merged

GitHub Issue 1446: Scope delete-data confirmation to current folder #8093

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a1fb51
GitHub Issue 1446: Scope delete-data confirmation to current folder
cnathe Sep 24, 2026
c98cb61
update comment
cnathe Sep 25, 2026
b6b0b03
Merge remote-tracking branch 'origin/develop' into fb_deleteData1446
cnathe Sep 25, 2026
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
11 changes: 9 additions & 2 deletions experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3937,8 +3937,14 @@ public ModelAndView getView(DeleteForm deleteForm, boolean reshow, BindException

List<ExpData> datas = getDatas(deleteForm, false);
List<ExpRun> runs = getRuns(datas);
ConfirmDeleteView view = new ConfirmDeleteView("Data", ShowDataAction.class, datas, deleteForm, runs);

return new ConfirmDeleteView("Data", ShowDataAction.class, datas, deleteForm, runs);
// GitHub Issue #1446: show ConfirmDeleteView with a message indicating if not all of the ids resolve within the container context
int unresolved = deleteForm.getIds(false).size() - datas.size();
if (unresolved == 0)
return view;

return new VBox(new HtmlView(DIV(unresolved + " of the selected items could not be found in this folder.")), view);
}

private List<ExpRun> getRuns(List<ExpData> datas)
Expand All @@ -3953,7 +3959,8 @@ private List<ExpData> getDatas(DeleteForm deleteForm, boolean clear)
for (long dataId : deleteForm.getIds(clear))
{
ExpData data = ExperimentService.get().getExpData(dataId);
if (data != null)
// GitHub Issue #1446: deleteObjects() only deletes within getContainer(), so don't resolve data from other folders
if (data != null && data.getContainer().equals(getContainer()))
{
datas.add(data);
}
Expand Down
Loading