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: 0 additions & 2 deletions api/src/org/labkey/api/assay/AssayUrls.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ public interface AssayUrls extends UrlProvider

ActionURL getChooseCopyDestinationURL(ExpProtocol protocol, Container container);

ActionURL getDeleteDesignURL(ExpProtocol protocol);

/**
* Returns the URL for the assay import data wizard for an existing assay definition.
* path and files may be null, in which case it is assumed that the POST will include data object RowIds
Expand Down
11 changes: 0 additions & 11 deletions api/src/org/labkey/api/assay/actions/AssayHeaderView.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,6 @@ public List<NavTree> getLinks()
return links;
}

public static String getDeleteOnClick(ExpProtocol protocol, Container currentContainer)
{
ActionURL deleteURL = PageFlowUtil.urlProvider(AssayUrls.class).getDeleteDesignURL(protocol);
String extraWarning = "";
if (!protocol.getContainer().equals(currentContainer))
{
extraWarning = " It is defined in " + protocol.getContainer().getPath() + " and deleting it will remove it from all subfolders.";
}
return "if (window.confirm('Are you sure you want to delete this assay design and all of its runs?" + extraWarning + "')) { window.location = '" + deleteURL + "' }";
}

public ExpProtocol getProtocol()
{
return _protocol;
Expand Down
10 changes: 0 additions & 10 deletions assay/src/org/labkey/assay/AssayController.java
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
import org.labkey.assay.actions.AssayBatchDetailsAction;
import org.labkey.assay.actions.AssayBatchesAction;
import org.labkey.assay.actions.AssayResultsAction;
import org.labkey.assay.actions.DeleteAction;
import org.labkey.assay.actions.DeleteProtocolAction;
import org.labkey.assay.actions.GetAssayBatchAction;
import org.labkey.assay.actions.GetAssayBatchesAction;
Expand Down Expand Up @@ -174,7 +173,6 @@
import org.labkey.api.security.permissions.AbstractContainerScopingTest;
import org.labkey.api.security.roles.EditorRole;
import org.labkey.api.security.roles.ReaderRole;
import org.labkey.api.util.JunitUtil;
import org.labkey.api.util.TestContext;
import org.labkey.api.view.ViewBackgroundInfo;
import org.labkey.api.view.ViewContext;
Expand Down Expand Up @@ -212,7 +210,6 @@ public class AssayController extends SpringActionController
AssayResultsAction.class,
AssayRunDetailsAction.class,
AssayRunsAction.class,
DeleteAction.class,
DeleteProtocolAction.class,
DesignerAction.class,
GetAssayBatchAction.class,
Expand Down Expand Up @@ -444,7 +441,6 @@ private static Map<String, Object> serializeAssayLinks(ExpProtocol protocol, Ass
links.put("batches", urlProvider.getAssayBatchesURL(c, protocol, null));
links.put("begin", urlProvider.getProtocolURL(c, protocol, AssayBeginAction.class));
links.put("designCopy", urlProvider.getDesignerURL(c, protocol, true, null));
links.put("designDelete", urlProvider.getDeleteDesignURL(protocol));
links.put("designEdit", urlProvider.getDesignerURL(c, protocol, false, null));
links.put("import", provider.getImportURL(c, protocol));
links.put("results", urlProvider.getAssayResultsURL(c, protocol));
Expand Down Expand Up @@ -1175,12 +1171,6 @@ public ActionURL getChooseCopyDestinationURL(ExpProtocol protocol, Container con
return getProtocolURL(container, protocol, ChooseCopyDestinationAction.class);
}

@Override
public ActionURL getDeleteDesignURL(ExpProtocol protocol)
{
return getProtocolURL(protocol.getContainer(), protocol, DeleteAction.class);
}

@Override
public ActionURL getImportURL(Container container, ExpProtocol protocol, String path, File[] files)
{
Expand Down
74 changes: 0 additions & 74 deletions assay/src/org/labkey/assay/actions/DeleteAction.java

This file was deleted.