Merge branch '2023.06.x'

* 2023.06.x: fix github actions MIR-1347-allow to change the number of entries per page of the filebox with a property MIR-1346 Allow to add custom meta elements in mir-flatmir-layout.xsl MIR-1349 include ID correctly MIR-1348 Provide realm of user in link to profile Bump follow-redirects in /mir-webapp/src/main/vue/name-search (#981) Bump follow-redirects in /mir-webapp/src/main/vue/editor-tools (#982) Bump webpack-dev-middleware in /mir-webapp/src/main/vue/name-search (#985) Bump express in /mir-webapp/src/main/vue/editor-tools (#993) Bump express in /mir-webapp/src/main/vue/name-search (#994) Bump micromatch in /mir-webapp/src/main/vue/editor-tools (#1050) Bump webpack in /mir-webapp/src/main/vue/name-search (#1051) MIR-1336 Display realname of creator/modifier in mir-admin-box (#1031) MIR-1343 Do not render mir-admindata-box staticly (#1040) MIR-1344 update JavaScript dependencies Bump select2 from 4.0.6-rc.1 to 4.0.6 in /mir-module MIR-1338 fixed missing url encoding in solr query (#1033) MIR-1337 fix property to control display of real name (#1032) MIR-1339 Obtain ORCID from lobid in xEditor name search (#1034) Bump jsoup from 1.15.2 to 1.15.3
MyCoRe-Org · Sep 11, 2024 · 25c0b66 · 25c0b66
2 parents ede163a + b5aabd7
commit 25c0b66
Show file tree

Hide file tree

Showing 29 changed files with 1,439 additions and 1,188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,7 +106,7 @@ jobs:
         docker push mycoreorg/mir-solr:${GITHUB_REF_NAME}-${BUILD_START}
     - name: Upload logs on build failure
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: test-results
         path: |

diff --git a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java
@@ -128,7 +128,7 @@ protected void assertEqualsIgnoreCase(String message, String expected, String ac
     }
 
     public void assertUserCreated(String user) {
-        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen:" + user));
+        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen: " + user));
     }
 
     public void assertValidationErrorVisible() {

diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-meta-tags.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-meta-tags.xsl
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- Overwrite stylesheet and template in your application module to add custom meta elements -->
+  <xsl:template name="mir-flatmir-layout-meta-tags"/>
+</xsl:stylesheet>
diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl
@@ -8,10 +8,10 @@
   xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
   exclude-result-prefixes="xlink i18n">
 
-  <xsl:output method="html" indent="yes" omit-xml-declaration="yes" media-type="text/html"
-    version="5" />
+  <xsl:output method="html" indent="yes" omit-xml-declaration="yes" media-type="text/html" version="5" />
   <xsl:strip-space elements="*" />
   <xsl:include href="resource:xsl/mir-flatmir-layout-utils.xsl"/>
+  <xsl:include href="resource:xsl/mir-flatmir-layout-meta-tags.xsl"/>
   <xsl:param name="MIR.DefaultLayout.CSS" />
   <xsl:param name="MIR.CustomLayout.CSS" select="''" />
   <xsl:param name="MIR.CustomLayout.JS" select="''" />
@@ -25,6 +25,7 @@
       <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+        <xsl:call-template name="mir-flatmir-layout-meta-tags"/>
         <title>
           <xsl:value-of select="$PageTitle" />
         </title>