Merge pull request #1727 from griidc/hotfix/6.67.1

Hotfix/6.67.1
griidc · Jan 10, 2025 · ac1c756 · ac1c756
2 parents d48b07b + abb63fb
commit ac1c756
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.11",
-        "easycorp/easyadmin-bundle": "^4.0",
+        "easycorp/easyadmin-bundle": "^4.12.0",
         "easyrdf/easyrdf": "^1.1",
         "fdekker/log-viewer-bundle": "^1.3",
         "friendsofsymfony/elastica-bundle": "^6.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -21,4 +21,5 @@
     EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
     Knp\Bundle\SnappyBundle\KnpSnappyBundle::class => ['all' => true],
     FD\LogViewer\FDLogViewerBundle::class => ['all' => true],
+    Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
 ];
diff --git a/config/packages/twig_component.yaml b/config/packages/twig_component.yaml
@@ -0,0 +1,5 @@
+twig_component:
+    anonymous_template_directory: 'components/'
+    defaults:
+        # Namespace & directory for components
+        App\Twig\Components\: 'components/'
diff --git a/symfony.lock b/symfony.lock
@@ -636,6 +636,18 @@
     "symfony/uid": {
         "version": "v5.4.3"
     },
+    "symfony/ux-twig-component": {
+        "version": "2.22",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.13",
+            "ref": "67814b5f9794798b885cec9d3f48631424449a01"
+        },
+        "files": [
+            "config/packages/twig_component.yaml"
+        ]
+    },
     "symfony/validator": {
         "version": "5.4",
         "recipe": {

diff --git a/templates/Dataland/metadata.markup.twig b/templates/Dataland/metadata.markup.twig
@@ -2,7 +2,7 @@
 {
    "name" : "{{dataset.title}}",
    "alternateName" : "{{dataset.datasetSubmission.shortTitle}}",
-   "creator:[
+   "creator" : [
       {
           "@type": "Person",
           "name": "{{dataset.datasetSubmission.datasetContacts[0].person.lastName}}, {{dataset.datasetSubmission.datasetContacts[0].person.firstName}}",