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

Set ExpRun's filePathRoot to be the container's file root #724

Merged
merged 5 commits into from
May 23, 2023
Merged

Set ExpRun's filePathRoot to be the container's file root #724

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e235e0
Troubleshoot path
labkey-martyp Apr 25, 2023
0a1cc92
Remove logs
labkey-martyp Apr 26, 2023
6fc4a1d
Set ExpRun's filePathRoot to be the container's file root.
vagisha May 20, 2023
873511d
Merge remote-tracking branch 'origin/release23.3-SNAPSHOT' into 23.3_…
labkey-martyp May 22, 2023
8bab49a
Merge branch '23.3_fb_copy_vs_mv_pano_files' of https://github.com/La…
vagisha May 22, 2023
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
4 changes: 2 additions & 2 deletions src/org/labkey/targetedms/TargetedMSManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.labkey.api.exp.api.ExpProtocol;
import org.labkey.api.exp.api.ExpRun;
import org.labkey.api.exp.api.ExperimentService;
import org.labkey.api.files.FileContentService;
import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.module.ModuleProperty;
Expand Down Expand Up @@ -692,12 +693,11 @@ private static ExpRun wrapRun(TargetedMSRun run, User user, PipeRoot pipeRoot, I
}

ExpData expData = ExperimentService.get().getExpData(run.getDataId());
Path skylineFile = pipeRoot.resolveToNioPathFromUrl(expData.getDataFileUrl());

ExpRun expRun = ExperimentService.get().createExperimentRun(container, run.getDescription());
expRun.setProtocol(protocol);
expRun.setJobId(jobId);
expRun.setFilePathRootPath(null != skylineFile ? skylineFile.getParent() : null);
expRun.setFilePathRootPath(FileContentService.get().getFileRootPath(container, FileContentService.ContentType.files));
ViewBackgroundInfo info = new ViewBackgroundInfo(container, user, null);

Map<ExpData, String> inputDatas = new HashMap<>();
Expand Down