Merge branch 'master' into dev-sxnd-fixes-search

This commit is contained in:
Sebastian Meyer 2022-08-04 18:15:59 +02:00 committed by GitHub
commit 24a848395c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions

View File

@ -53,9 +53,9 @@ There are three objects that may be set, each of which is passed to ``stdWrap``
- ``key``: First, the (localized) *label* of the metadata entry, such as "Title" or "Year", is transformed using the ``key`` object.
- ``value``: Each *value* of the entry is transformed using the ``value`` object and appended to the output.
- ``value``: Each *value* of the entry is transformed using the ``value`` object.
- ``all``: The combined output (label and values) is processed using the ``all`` object.
- ``all``: The combined output (label and values) is processed using the ``all`` object and appended to the output (unless there is no value or all processed values are blank).
Finally, all entries are wrapped in a definition list (``<dl>`` tag). If one of the objects is not specified, the unprocessed output is taken as-is.

View File

@ -15,8 +15,8 @@
{configObject.wrap -> kitodo:metadataWrapVariable(name: 'metadataWrap')}
<f:variable name="metaSectionCObj" value="{metaCObjData.{sectionIterator.index}}" />
<kitodo:stdWrap wrap="{metadataWrap.all}" data="{metaSectionCObj}">
<kitodo:stdWrap wrap="{metadataWrap.key}" data="{metaSectionCObj}">{configObject.label}</kitodo:stdWrap>
<f:variable name="wrappedValues"><f:spaceless>
<f:for each="{documentMetadataSection.{configObject.indexName}}" as="value" iteration="iterator">
<f:variable name="buildUrlVariable" value="{buildUrl.{sectionIterator.index}}" />
<f:if condition="{buildUrlVariable.{configObject.indexName}}">
@ -28,4 +28,11 @@
</f:else>
</f:if>
</f:for>
</kitodo:stdWrap>
</f:spaceless></f:variable>
<f:if condition="{wrappedValues}">
<kitodo:stdWrap wrap="{metadataWrap.all}" data="{metaSectionCObj}">
<kitodo:stdWrap wrap="{metadataWrap.key}" data="{metaSectionCObj}">{configObject.label}</kitodo:stdWrap>
{wrappedValues -> f:format.raw()}
</kitodo:stdWrap>
</f:if>