Skip to content
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

Jump to bottom

Move peptide/protein search actions #442

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Move peptide/protein search actions #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67713c5
Move peptide/protein search actions
labkey-adam Jun 12, 2024
eeae2ce
Repackage protein api classes
labkey-adam Jun 12, 2024
7c031d1
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
4 changes: 2 additions & 2 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import org.labkey.api.module.ModuleContext;
import org.labkey.api.module.SpringModule;
import org.labkey.api.pipeline.PipelineService;
import org.labkey.api.protein.PeptideSearchForm;
import org.labkey.api.protein.ProteinSearchForm;
import org.labkey.api.protein.search.PeptideSearchForm;
import org.labkey.api.protein.search.ProteinSearchForm;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.api.security.roles.RoleManager;
import org.labkey.api.settings.AdminConsole;
Expand Down
6 changes: 3 additions & 3 deletions panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
%>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%@ page import="org.labkey.api.ms2.MS2Urls" %>
<%@ page import="org.labkey.api.protein.PeptideSearchForm" %>
<%@ page import="org.labkey.api.protein.search.PeptideSearchForm" %>
<%@ page import="org.labkey.api.protein.ProteinService" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.api.view.JspView" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
Expand All @@ -26,7 +26,7 @@
PeptideSearchForm model = me.getModelBean();
%>

<labkey:form action="<%=urlProvider(MS2Urls.class).getPepSearchUrl(getContainer())%>" method="get">
<labkey:form action="<%=ProteinService.get().getPeptideSearchUrl(getContainer())%>" method="get">
<table class="lk-fields-table">
<tr>
<td class="labkey-form-label"><label for="pepSeq">Peptide sequence</label> *<%=helpPopup("Peptide Sequence", "Enter the peptide sequence to find, or multiple sequences separated by commas. Use * to match any sequence of characters.")%></td>
Expand Down
6 changes: 3 additions & 3 deletions panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
*/
%>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%@ 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" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
<%
JspView<ProteinSearchForm> me = (JspView<ProteinSearchForm>) HttpView.currentView();
ProteinSearchForm bean = me.getModelBean();
%>
<labkey:form action="<%=urlProvider(MS2Urls.class).getProteinSearchUrl(getContainer())%>">
<labkey:form action="<%=ProteinService.get().getProteinSearchUrl(getContainer())%>">
<table class="lk-fields-table">
<tr>
<td class="labkey-form-label">Protein name *<%= helpPopup("Protein name", "Required to search for proteins. You may use the name as specified by the FASTA file, or an annotation, such as a gene name, that has been loaded from an annotations file. You may comma separate multiple names.") %></td>
Expand Down