Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
f89e2d72
Commit
f89e2d72
authored
Dec 22, 2015
by
Matija Obreza
Browse files
Fixed display for selected columns in /explore
parent
5de135c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
View file @
f89e2d72
...
...
@@ -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
'
scientific
Name'
}
"
>
<c:when
test=
"
${
col
eq
'
taxonomy.sci
Name'
}
"
>
<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
'inst
C
ode'
}
"
>
<c:when
test=
"
${
col
eq
'inst
itute.c
ode'
}
"
>
<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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment