Fix sulu-link tag for internal link pages (#6484)

* Set urls for internal link pages in ContentRepository * Set urls only if mapping includes resolveUrl flag
sulu · Feb 23, 2022 · 0556f12 · 0556f12
1 parent be36be2
commit 0556f12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Sulu/Bundle/PageBundle/Tests/Functional/Repository/ContentRepositoryTest.php b/src/Sulu/Bundle/PageBundle/Tests/Functional/Repository/ContentRepositoryTest.php
@@ -696,11 +696,12 @@ public function testFindWithInternalLink()
             $page->getUuid(),
             'de',
             'sulu_io',
-            MappingBuilder::create()->addProperties(['title'])->getMapping()
+            MappingBuilder::create()->addProperties(['title'])->setResolveUrl(true)->getMapping()
         );
 
         $this->assertEquals($page->getUuid(), $result->getId());
         $this->assertEquals('/test-2', $result->getPath());
+        $this->assertEquals('/test-1', $result->getUrl());
         $this->assertEquals('test-2', $result['title']);
     }
 

diff --git a/src/Sulu/Component/Content/Repository/ContentRepository.php b/src/Sulu/Component/Content/Repository/ContentRepository.php
@@ -820,6 +820,11 @@ public function resolveInternalLinkContent(
             $type
         );
 
+        if ($mapping->resolveUrl()) {
+            $content->setUrl($linkedContent->getUrl());
+            $content->setUrls($linkedContent->getUrls());
+        }
+
         if (!$content->getTemplate() || !$this->structureManager->getStructure($content->getTemplate())) {
             $content->setBrokenTemplate();
         }