Commit eeb20e3e authored by Alexander Dolzhenko's avatar Alexander Dolzhenko Committed by Matija Obreza

add value for list

parent 3276a847
......@@ -440,7 +440,7 @@ var GenesysFilter = {
}
},
// add filter with few checkboxes
filterList : function(element, jsonData) {
filterList : function(element, jsonData, textValue) {
var key = $(element).attr('i-key');
var normKey = GenesysFilter.normKey(key);
var option = $(element).val();
......@@ -452,7 +452,7 @@ var GenesysFilter = {
if (checked && !GenesysFilterUtil.existInJson(value, key, jsonData)) {
jsonData[key] = GenesysFilterUtil.collectData(key, value, jsonData);
GenesysFilterUtil.appendHtml(key, value, value, element);
GenesysFilterUtil.appendHtml(key, textValue, value, element);
} else {
var xkey = normKey + value;
......
......@@ -264,6 +264,12 @@
<c:set var="string" value="${varNull}" />
<c:set var="value" value="null" />
</c:if>
<c:if test="${appliedFilter.key=='storage'}">
<spring:message code='accession.storage.${value}' var="string"/>
</c:if>
<c:if test="${appliedFilter.key=='sampStat'}">
<spring:message code='accession.sampleStatus.${value}' var="string"/>
</c:if>
<div class="filtval complex" x-key="<c:out value="${normalizedKey}" /><c:out value="${value}"/>" i-key="<c:out value="${filter.key}" />"><c:out value="${string}" /></div>
<c:remove var="string" />
</c:forEach>
......@@ -396,7 +402,7 @@
});
$("body").on("click", ".filter-list", function () {
GenesysFilter.filterList($(this), jsonData);
GenesysFilter.filterList($(this), jsonData,$(this).parent().text());
});
$("body").on("click", ".filter-auto", function () {
......
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