[FIX] use source file to render editlink

jaapio · linawolf · commit 7ad266fc59db · 2024-11-16T11:01:58.000+01:00
diff --git a/packages/typo3-docs-theme/src/Twig/TwigExtension.php b/packages/typo3-docs-theme/src/Twig/TwigExtension.php
@@ -288,14 +288,14 @@ public function getEditOnGitHubLink(array $context): string
             return '';
         }
         $githubBranch = $this->themeSettings->getSettings('edit_on_github_branch', 'main');
-        $currentFileName = $this->getCurrentFilename($context);
-        if ($currentFileName === '') {
+        $sourceFile = $this->getSourceFilename($context);
+        if ($sourceFile === '') {
             return '';
         }
         $gitHubPerPageLink = $this->getEditOnGitHubLinkPerPage($renderContext);
 
         $githubDirectory = trim($this->themeSettings->getSettings('edit_on_github_directory', 'Documentation'), '/');
-        return $gitHubPerPageLink ?? sprintf("https://github.com/%s/edit/%s/%s/%s.rst", $githubButton, $githubBranch, $githubDirectory, $currentFileName);
+        return $gitHubPerPageLink ?? sprintf("https://github.com/%s/edit/%s/%s/%s", $githubButton, $githubBranch, $githubDirectory, $sourceFile);
     }
 
     private function getEditOnGitHubLinkPerPage(RenderContext $renderContext): string|null

Original file line number	Diff line number	Diff line change
`@@ -288,14 +288,14 @@ public function getEditOnGitHubLink(array $context): string`
`288`	`288`	`return '';`
`289`	`289`	`}`
`290`	`290`	`$githubBranch = $this->themeSettings->getSettings('edit_on_github_branch', 'main');`
`291`		`- $currentFileName = $this->getCurrentFilename($context);`
`292`		`- if ($currentFileName === '') {`
	`291`	`+ $sourceFile = $this->getSourceFilename($context);`
	`292`	`+ if ($sourceFile === '') {`
`293`	`293`	`return '';`
`294`	`294`	`}`
`295`	`295`	`$gitHubPerPageLink = $this->getEditOnGitHubLinkPerPage($renderContext);`
`296`	`296`
`297`	`297`	`$githubDirectory = trim($this->themeSettings->getSettings('edit_on_github_directory', 'Documentation'), '/');`
`298`		`- return $gitHubPerPageLink ?? sprintf("https://github.com/%s/edit/%s/%s/%s.rst", $githubButton, $githubBranch, $githubDirectory, $currentFileName);`
	`298`	`+ return $gitHubPerPageLink ?? sprintf("https://github.com/%s/edit/%s/%s/%s", $githubButton, $githubBranch, $githubDirectory, $sourceFile);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`private function getEditOnGitHubLinkPerPage(RenderContext $renderContext): string\|null`