From f89e2d72e8a0bd723836e1a9a3580e3dff2dbf4f Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 22 Dec 2015 13:55:08 +0100
Subject: [PATCH] Fixed display for selected columns in /explore

---
 .../webapp/WEB-INF/jsp/accession/explore.jsp  | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/accession/explore.jsp b/src/main/webapp/WEB-INF/jsp/accession/explore.jsp
index 275ea3379..c8e962d07 100644
--- a/src/main/webapp/WEB-INF/jsp/accession/explore.jsp
+++ b/src/main/webapp/WEB-INF/jsp/accession/explore.jsp
@@ -426,7 +426,7 @@
 			<%--<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: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>
                     </c:when>
                     <c:when test="${col eq 'orgCty'}">
@@ -435,18 +435,18 @@
                     <c:when test="${col eq 'sampStat'}">
                         <td class="notimportant"><spring:message code="accession.sampleStatus.${accession.sampStat}"/></td>
                     </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
                                 value="${accession.institute.code}"/></a></td>
                     </c:when>
-                    <c:when test="${col eq 'genus'}">
-                        <td class="notimportant"><c:out value="${accession.taxonomy.genus}"/></td>
+                    <c:when test="${col eq 'taxonomy.genus'}">
+                        <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.genus}"/></span></td>
                     </c:when>
-                    <c:when test="${col eq 'species'}">
-                        <td class="notimportant"><c:out value="${accession.taxonomy.species}"/></td>
+                    <c:when test="${col eq 'taxonomy.species'}">
+                        <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.species}"/></span></td>
                     </c:when>
-                    <c:when test="${col eq 'subtaxa'}">
-                        <td class="notimportant"><c:out value="${accession.taxonomy.subtaxa}"/></td>
+                    <c:when test="${col eq 'taxonomy.subtaxa'}">
+                        <td class="notimportant"><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.subtaxa}"/></span></td>
                     </c:when>
                     <c:when test="${col eq 'crops'}">
                         <c:if test="${fn:length(accession.crops) == 0}">
@@ -457,18 +457,14 @@
                                     value="${crop.getName(pageContext.response.locale)}"
                                     /></a></td>
                         </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:otherwise>
-	               		<c:set var="elVal" value="${accession}" />
-	               		<c:forTokens items="${col}" delims="." var="item">   
-						    <c:set var="elVal" value="${elVal[item]}" />
-						</c:forTokens>
-	                    <td class="notimportant"><c:out value="${elVal}"/></td>
-	                    <c:remove var="elVal"/>
+		               		<c:set var="elVal" value="${accession}" />
+		               		<c:forTokens items="${col}" delims="." var="item">   
+											    <c:set var="elVal" value="${elVal[item]}" />
+											</c:forTokens>
+		                  <td class="notimportant"><c:out value="${elVal}"/></td>
+		                  <c:remove var="elVal"/>
                     </c:otherwise>
                 </c:choose>
             </c:forEach>
-- 
GitLab