Skip to content

Commit 95d12b8

Browse files
committed
Ensure view names are distinct so artifacts are not packaged together
1 parent 87cacc5 commit 95d12b8

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

jbrowse/resources/web/README.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

jbrowse/src/client/entryPoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
module.exports = {
77
apps: [{
8-
name: 'jbrowse',
8+
name: 'jbrowseBrowser',
99
title: 'JBrowse Genome Browser',
1010
permission: 'read',
1111
path: './src/client/JBrowse/Browser'

jbrowse/src/org/labkey/jbrowse/JBrowseController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ private static boolean isValidUUID(String str)
350350
}
351351

352352
@RequiresPermission(ReadPermission.class)
353-
public class JBrowseAction extends SimpleViewAction<BrowserForm>
353+
public static class JBrowseAction extends SimpleViewAction<BrowserForm>
354354
{
355355
private String _title;
356356

@@ -362,7 +362,7 @@ public ModelAndView getView(BrowserForm form, BindException errors) throws Excep
362362
_title = db == null ? "JBrowse" : db.getName();
363363
form.setPageTitle(_title);
364364

365-
ModuleHtmlView view = ModuleHtmlView.get(ModuleLoader.getInstance().getModule(JBrowseModule.class), Path.parse("views/gen/jbrowse.html"));
365+
ModuleHtmlView view = ModuleHtmlView.get(ModuleLoader.getInstance().getModule(JBrowseModule.class), Path.parse("views/gen/jbrowseBrowser.html"));
366366
assert view != null;
367367
getPageConfig().setIncludePostParameters(true);
368368

@@ -377,7 +377,7 @@ public void addNavTrail(NavTree root)
377377
}
378378

379379
@RequiresPermission(ReadPermission.class)
380-
public class BrowserAction extends JBrowseAction
380+
public static class BrowserAction extends JBrowseAction
381381
{
382382

383383
}

0 commit comments

Comments
 (0)