Skip to content
This repository was archived by the owner on Jun 25, 2024. It is now read-only.

Move protein/peptide search actions #68

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Move protein/peptide search actions #68

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
6d2ed4c
Repackage protein api classes
labkey-adam Jun 12, 2024
da2bb08
Prep to move DoProteinSearchAction
labkey-adam Jun 13, 2024
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 src/org/labkey/mq/MqModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.labkey.api.module.FolderTypeManager;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.pipeline.PipelineService;
import org.labkey.api.protein.ProteinSearchForm;
import org.labkey.api.protein.search.ProteinSearchForm;
import org.labkey.api.protein.ProteinService;
import org.labkey.api.query.QueryService;
import org.labkey.api.query.QuerySettings;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/mq/MqProteinSearchViewProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.TableInfo;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.protein.ProteinSearchForm;
import org.labkey.api.protein.search.ProteinSearchForm;
import org.labkey.api.query.FieldKey;
import org.labkey.api.query.FilteredTable;
import org.labkey.api.query.QuerySettings;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/mq/view/ProteinSearchWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.labkey.mq.view;

import org.labkey.api.module.ModuleLoader;
import org.labkey.api.protein.ProteinSearchForm;
import org.labkey.api.protein.search.ProteinSearchForm;
import org.labkey.api.protein.ProteinService;
import org.labkey.api.view.JspView;
import org.labkey.api.view.ViewContext;
Expand Down
6 changes: 3 additions & 3 deletions src/org/labkey/mq/view/proteinSearch.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%@ page import="org.labkey.api.ms2.MS2Urls" %>
<%@ page import="org.labkey.api.protein.ProteinSearchForm" %>
<%@ page import="org.labkey.api.protein.ProteinService" %>
<%@ page import="org.labkey.api.protein.search.ProteinSearchForm" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.api.view.JspView" %>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
Expand All @@ -9,7 +9,7 @@
ProteinSearchForm bean = me.getModelBean();
%>

<labkey:form layout="horizontal" action="<%=urlProvider(MS2Urls.class).getProteinSearchUrl(getContainer())%>">
<labkey:form layout="horizontal" action="<%=ProteinService.get().getProteinSearchUrl(getContainer())%>">
<labkey:input type="text"
id="identifierInput"
name="identifier"
Expand Down