Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 flow/src/org/labkey/flow/view/FlowQueryView.java
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
publishURL.addParameter("containerFilterName", getTable().getContainerFilter().getType().name());

ActionButton publishButton = new ActionButton(publishURL,
"Copy to Study", DataRegion.MODE_GRID, ActionButton.Action.POST);
"Copy to Study", ActionButton.Action.POST);
publishButton.setDisplayPermission(InsertPermission.class);
publishButton.setRequiresSelection(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public ModelAndView getView(FeatureAnnotationSetForm form, BindException errors)
editURL.addParameter("RowId", form.getRowId());
editURL.addReturnURL(getViewContext().getActionURL());

ActionButton edit = new ActionButton(editURL, "Edit", DataRegion.MODE_DETAILS);
ActionButton edit = new ActionButton(editURL, "Edit");
edit.setActionType(ActionButton.Action.LINK);
edit.setDisplayPermission(UpdatePermission.class);
bb.add(edit);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected void init()
protected void populateButtonBar(DataView view, ButtonBar bar)
{
super.populateButtonBar(view, bar);
ActionButton deleteButton = new ActionButton(FeatureAnnotationSetController.DeleteAction.class, "Delete", DataRegion.MODE_GRID, ActionButton.Action.GET);
ActionButton deleteButton = new ActionButton(FeatureAnnotationSetController.DeleteAction.class, "Delete", ActionButton.Action.GET);
deleteButton.setDisplayPermission(DeletePermission.class);
ActionURL deleteURL = new ActionURL(FeatureAnnotationSetController.DeleteAction.class, getContainer());
deleteURL.addParameter(ActionURL.Param.returnUrl, getViewContext().getActionURL().toString());
Expand All @@ -83,14 +83,14 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
deleteButton.setRequiresSelection(true);
bar.add(deleteButton);

ActionButton uploadButton = new ActionButton(FeatureAnnotationSetController.UploadAction.class, "Import Feature Annotation Set", DataRegion.MODE_GRID, ActionButton.Action.LINK);
ActionButton uploadButton = new ActionButton(FeatureAnnotationSetController.UploadAction.class, "Import Feature Annotation Set", ActionButton.Action.LINK);
ActionURL uploadURL = new ActionURL(FeatureAnnotationSetController.UploadAction.class, getContainer());
uploadURL.addParameter(ActionURL.Param.returnUrl, getViewContext().getActionURL().toString());
uploadButton.setURL(uploadURL);
uploadButton.setDisplayPermission(UpdatePermission.class);
bar.add(uploadButton);

bar.add(new ActionButton(new ActionURL(FeatureAnnotationSetController.UploadAction.class, getContainer()), "Submit", DataRegion.MODE_UPDATE));
bar.add(new ActionButton(new ActionURL(FeatureAnnotationSetController.UploadAction.class, getContainer()), "Submit"));
}


Expand Down
2 changes: 1 addition & 1 deletion ms1/src/org/labkey/ms1/MS1ExperimentRunType.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void populateButtonBar(ViewContext context, ButtonBar bar, DataView view,
{
ActionURL compareUrl = new ActionURL(MS1Controller.CompareRunsSetupAction.class, context.getContainer());
String script = MS1Controller.createVerifySelectedScript(view, compareUrl);
ActionButton b = new ActionButton(compareUrl, "Compare", DataRegion.MODE_ALL, ActionButton.Action.LINK);
ActionButton b = new ActionButton(compareUrl, "Compare", ActionButton.Action.LINK);
b.setScript(script);
bar.add(b);
}
Expand Down