Skip to content

Merge discvr-20.7 to develop #58

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
bbimber merged 2 commits into from
Oct 19, 2020
Merged

Merge discvr-20.7 to develop #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9126a3e
Prepare to cache genomes on remote filesystem
bbimber Oct 15, 2020
3f482c6
Merge discvr-20.7 to develop
bbimber Oct 19, 2020
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 LDK/src/org/labkey/ldk/LDKController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ public ModelAndView getView(Object form, BindException errors) throws Exception
{
if (getContainer().hasPermission(getUser(), AdminPermission.class))
{
return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), Path.parse("/views/setRedirectUrl.html"));
return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), "setRedirectUrl");
}
else
{
Expand Down