Skip to content

appendNavTrail issues #3

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
labkey-dave merged 2 commits into from
Mar 26, 2019
Merged

appendNavTrail issues #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12e5951
appendNavTrail issues
labkey-dave Mar 25, 2019
bc47650
appendNavTrail issues
labkey-dave Mar 26, 2019
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
21 changes: 13 additions & 8 deletions api/src/org/labkey/api/study/actions/UploadWizardAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,18 +756,23 @@ protected void addSampleInputColumns(FormType form, InsertView insertView)
// Don't add any inputs in the base case
}

@Nullable
public NavTree appendNavTrail(NavTree root)
{
ActionURL helper = PageFlowUtil.urlProvider(AssayUrls.class).getAssayRunsURL(getContainer(), _protocol);
NavTree result = root.addChild("Assay List", PageFlowUtil.urlProvider(AssayUrls.class).getAssayListURL(getContainer()));
result.addChild(_protocol.getName(), PageFlowUtil.urlProvider(AssayUrls.class).getAssayRunsURL(getContainer(), _protocol));
String finalChild = "Data Import";
if (_stepDescription != null)
if (null != _protocol)
{
finalChild = finalChild + ": " + _stepDescription;
ActionURL helper = PageFlowUtil.urlProvider(AssayUrls.class).getAssayRunsURL(getContainer(), _protocol);
NavTree result = root.addChild("Assay List", PageFlowUtil.urlProvider(AssayUrls.class).getAssayListURL(getContainer()));
result.addChild(_protocol.getName(), PageFlowUtil.urlProvider(AssayUrls.class).getAssayRunsURL(getContainer(), _protocol));
String finalChild = "Data Import";
if (_stepDescription != null)
{
finalChild = finalChild + ": " + _stepDescription;
}
result.addChild(finalChild, helper);
return result;
}
result.addChild(finalChild, helper);
return result;
return null;
}

protected DataRegion createDataRegionForInsert(TableInfo baseTable, String lsidCol, List<? extends DomainProperty> domainProperties, Map<String, String> columnNameToPropertyName)
Expand Down
6 changes: 4 additions & 2 deletions issues/src/org/labkey/issue/IssuesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,10 @@ public ModelAndView getView(IssuesController.IssuesForm form, boolean reshow, Bi

public NavTree appendNavTrail(NavTree root)
{
return new ListAction(getViewContext()).appendNavTrail(root).
addChild(getSingularEntityName() + " " + _issue.getIssueId() + ": " + StringUtils.trimToEmpty(_issue.getTitle()), getURL());
NavTree nav = new ListAction(getViewContext()).appendNavTrail(root);
if (null != _issue)
nav.addChild(getSingularEntityName() + " " + _issue.getIssueId() + ": " + StringUtils.trimToEmpty(_issue.getTitle()), getURL());
return nav;
}

public ActionURL getURL()
Expand Down
13 changes: 8 additions & 5 deletions study/src/org/labkey/study/controllers/InsertUpdateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,14 @@ public NavTree appendNavTrail(NavTree root)
rootURL = new ActionURL(StudyController.BeginAction.class, container);
}
root.addChild(study.getLabel(), rootURL);
ActionURL grid = new ActionURL(StudyController.DatasetAction.class, getContainer());
grid.addParameter(DatasetDefinition.DATASETKEY, _ds.getDatasetId());
grid.addParameter(DataRegion.LAST_FILTER_PARAM, "true");
root.addChild(_ds.getLabel(), grid);
appendExtraNavTrail(root);
if (null != _ds)
{
ActionURL grid = new ActionURL(StudyController.DatasetAction.class, getContainer());
grid.addParameter(DatasetDefinition.DATASETKEY, _ds.getDatasetId());
grid.addParameter(DataRegion.LAST_FILTER_PARAM, "true");
root.addChild(_ds.getLabel(), grid);
appendExtraNavTrail(root);
}
return root;
}

Expand Down