Commit 9bae0fb1 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.3-dev' into 'v4.x-master'

444: Prevent fallback to all collections if sourceId specified, but not

See merge request !41
parents 612ce6cc 20132fc9
Pipeline #26405 passed with stages
in 4 minutes and 11 seconds
......@@ -9,7 +9,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'eu.dariah.de.minfba'
version = '4.3.10-SNAPSHOT'
version = '4.3.12-SNAPSHOT'
repositories {
mavenLocal()
......
......@@ -40,8 +40,8 @@
<c:if test="${navSubSubItem.iconClass!=null && fn:length(navSubSubItem.iconClass)>0}">
<i class="${navSubSubItem.iconClass}"></i>&nbsp;
</c:if>
<c:if test="${navSubItem.displayCode!=null && fn:length(navSubItem.displayCode)>0}">
<s:message code="${navSubItem.displayCode}" />
<c:if test="${navSubSubItem.displayCode!=null && fn:length(navSubSubItem.displayCode)>0}">
<s:message code="${navSubSubItem.displayCode}" />
</c:if>
</a>
</c:if>
......
Subproject commit ad24b3019ac1fd234c76b119bff776157e2bebc2
Subproject commit 0391bf65650edc7fef658c5601d32508ce983c93
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