Merge branch 'develop' of github.com:IQSS/dataverse into 11157-builtin-users-oidc-auth

Author: GPortas

doc/release-notes/11172-fix-search-api-nested-metadata-fields.md

@@ -0,0 +1 @@
+Deeply nested compound fields are not (yet) supported by Dataverse but the Search API now properly avoids returning duplicate values for them. See #11172.

src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java

@@ -750,7 +750,7 @@ private void json(Map<String, List<String>> metadataFieldMapNames,
                     for (DatasetField datasetField : datasetFields) {
                         if (metadataBlockFieldNames.contains("*")
                                 || metadataBlockFieldNames.contains(datasetField.getDatasetFieldType().getName())) {
-                            if (datasetField.getDatasetFieldType().isCompound() || !datasetField.getDatasetFieldType().isHasParent()) {
+                            if (!datasetField.getDatasetFieldType().isHasParent()) {
                                 JsonObject item = JsonPrinter.json(datasetField);
                                 if (item != null) {
                                     fieldsArray.add(item);

src/main/webapp/dataset-versions.xhtml

@@ -135,7 +135,7 @@
         </p:column><!-- end: description column -->
 
         <!-- start: versionNote column -->
-        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.versionNote']}" class="col-sm-2">
+        <p:column headerText="#{bundle['file.dataFilesTab.versions.headers.versionNote']}" class="col-sm-2" rendered="#{versionNoteEnabled}">
             <ui:fragment rendered="#{versionNoteEnabled}">
                 <div><h:outputText value="#{versionTab.versionNote}" /></div>
             </ui:fragment>

src/main/webapp/dataverse_footer.xhtml

@@ -44,7 +44,7 @@
                     <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
                         <div class="poweredbylogo">
                             <span>#{bundle['footer.poweredby']}</span>
-                            <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
+                            <a href="https://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
                             <h:outputText class="version" value="v. #{settingsWrapper.appVersionWithBuildNumber}" rendered="#{!widgetView}"/>
                         </div>
                     </div>