Commit f89e2d72 authored by Matija Obreza's avatar Matija Obreza
Browse files

Fixed display for selected columns in /explore

parent 5de135c9
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
<%--<td><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.name}" /></a></td>--%> <%--<td><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.name}" /></a></td>--%>
<c:forEach items="${selectedColumns}" var="col"> <c:forEach items="${selectedColumns}" var="col">
<c:choose> <c:choose>
<c:when test="${col eq 'scientificName'}"> <c:when test="${col eq 'taxonomy.sciName'}">
<td><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.sciName}"/></span></td> <td><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.sciName}"/></span></td>
</c:when> </c:when>
<c:when test="${col eq 'orgCty'}"> <c:when test="${col eq 'orgCty'}">
...@@ -435,18 +435,18 @@ ...@@ -435,18 +435,18 @@
<c:when test="${col eq 'sampStat'}"> <c:when test="${col eq 'sampStat'}">
<td class="notimportant"><spring:message code="accession.sampleStatus.${accession.sampStat}"/></td> <td class="notimportant"><spring:message code="accession.sampleStatus.${accession.sampStat}"/></td>
</c:when> </c:when>
<c:when test="${col eq 'instCode'}"> <c:when test="${col eq 'institute.code'}">
<td class="notimportant"><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out <td class="notimportant"><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out
value="${accession.institute.code}"/></a></td> value="${accession.institute.code}"/></a></td>
</c:when> </c:when>
<c:when test="${col eq 'genus'}"> <c:when test="${col eq 'taxonomy.genus'}">
<td class="notimportant"><c:out value="${accession.taxonomy.genus}"/></td> <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.genus}"/></span></td>
</c:when> </c:when>
<c:when test="${col eq 'species'}"> <c:when test="${col eq 'taxonomy.species'}">
<td class="notimportant"><c:out value="${accession.taxonomy.species}"/></td> <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.species}"/></span></td>
</c:when> </c:when>
<c:when test="${col eq 'subtaxa'}"> <c:when test="${col eq 'taxonomy.subtaxa'}">
<td class="notimportant"><c:out value="${accession.taxonomy.subtaxa}"/></td> <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.subtaxa}"/></span></td>
</c:when> </c:when>
<c:when test="${col eq 'crops'}"> <c:when test="${col eq 'crops'}">
<c:if test="${fn:length(accession.crops) == 0}"> <c:if test="${fn:length(accession.crops) == 0}">
...@@ -457,18 +457,14 @@ ...@@ -457,18 +457,14 @@
value="${crop.getName(pageContext.response.locale)}" value="${crop.getName(pageContext.response.locale)}"
/></a></td> /></a></td>
</c:forEach> </c:forEach>
<%--<td class="notimportant"><c:out value="${accession.accessionId.pdci.cropName}"/></td>--%>
</c:when>
<c:when test="${col eq 'latitudeAndLongitude'}">
<td class="notimportant" dir="ltr"><c:out value="${accession.geo.latitude}"/>, <c:out value=" ${accession.geo.longitude}"/></td>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="elVal" value="${accession}" /> <c:set var="elVal" value="${accession}" />
<c:forTokens items="${col}" delims="." var="item"> <c:forTokens items="${col}" delims="." var="item">
<c:set var="elVal" value="${elVal[item]}" /> <c:set var="elVal" value="${elVal[item]}" />
</c:forTokens> </c:forTokens>
<td class="notimportant"><c:out value="${elVal}"/></td> <td class="notimportant"><c:out value="${elVal}"/></td>
<c:remove var="elVal"/> <c:remove var="elVal"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:forEach> </c:forEach>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment