git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into servlets
[proteocache.git] / webapp / view / reportProteinSequences.jsp
diff --git a/webapp/view/reportProteinSequences.jsp b/webapp/view/reportProteinSequences.jsp
index 29d7e36..c6be974 100644 (file)
--- a/webapp/view/reportProteinSequences.jsp
+++ b/webapp/view/reportProteinSequences.jsp
@@ -11,13 +11,12 @@
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
-               <spring:url value="/sequence/query" var="searchquery" />
-               <spring:url value="/joblog/query" var="jobquery" />
+               <spring:url value="/job/results" var="job_query" />
 
        <div class="panel panel-default">
        <div class="panel-heading">
                <c:choose>
-                       <c:when test="${flag == 'whole'}">
+                       <c:when test="${searchtype == 'whole'}">
                                <p style="font-weight:bold;">Jobs for the protein sequence: ${prot}</p>
                        </c:when>
                        <c:otherwise>
@@ -49,18 +48,16 @@
                                                                <tr>
                                                                        <th rowspan="${res.size + 2}"><a
                                                                                title="Click to view the job log"
-                                                                               href="${jobquery}?IdJob=${id}">${id}</a></th>
+                                                                               href="${job_query}?IdJob=${id}">${id}</a></th>
                                                                </tr>
                                                                <tr>
-                                                                       <td
-                                                                               style="text-align: center; font-weight: bold; font-family: monospace">Protein
-                                                                               Sequence</td>
-                                                                       <c:if test="${flag == 'whole'}">
+                                                                       <td style="text-align: center; font-weight: bold; font-family: monospace">Protein Sequence</td>
+                                                                       <c:if test="${searchtype == 'whole'}">
                                                                                <td
                                                                                        style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out
                                                                                                value="${res.sequence}" /></td>
                                                                        </c:if>
-                                                                       <c:if test="${flag == 'part'}">
+                                                                       <c:if test="${searchtype == 'partial'}">
                                                                                <td
                                                                                        style="text-align: left; border-buttom: dotted; font-family: monospace">
                                                                                        <c:forEach items="${res.subProt}" var="seq">