Merge branch 'feature/64183-redirect-problems' into develop

in2code-de · Nov 6, 2024 · ff5a2b5 · ff5a2b5
2 parents e0e1596 + 6cf8161
commit ff5a2b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Classes/Features/RedirectsSupport/Controller/RedirectController.php b/Classes/Features/RedirectsSupport/Controller/RedirectController.php
@@ -224,9 +224,9 @@ public function selectSiteAction(int $redirect, array $properties = null): Respo
                 ),
             );
             if (isset($_POST['_saveandpublish'])) {
-                $this->redirect('publish', null, null, ['redirects' => [$redirectDto->uid]]);
+                return $this->redirect('publish', null, null, ['redirects' => [$redirectDto->uid]]);
             }
-            $this->redirect('list');
+            return $this->redirect('list');
         }
         $sites = $this->foreignSiteFinder->getAllSites();
         $siteOptions = [

diff --git a/Resources/Private/Partials/Redirect/DirtyProperties.html b/Resources/Private/Partials/Redirect/DirtyProperties.html
@@ -11,12 +11,12 @@
 
 	Line breaks and whitespace is visible where this partial is rendered.
 </f:comment>
-	<f:if condition="{redirect.record.state} == 'changed'"><f:then>
+	<f:if condition="{redirect.state} == 'changed'"><f:then>
 <f:translate key="redirect.record.property" /> | <f:translate key="redirect.record.property.old" /> -> <f:translate key="redirect.record.property.new" />
 
-<f:for each="{redirect.record.dirtyProperties}" as="name">{name} | <publish:Miscellaneous.GetPropertyFromStagingDefinition record="{redirect.record}" propertyName="{name}" stagingLevel="foreign"/> -> <publish:Miscellaneous.GetPropertyFromStagingDefinition record="{redirect.record}" propertyName="{name}" stagingLevel="local"/>
+<f:for each="{redirect.changedProps}" as="name">{name} | <publish:Miscellaneous.GetPropertyFromStagingDefinition record="{redirect}" propertyName="{name}" stagingLevel="foreign"/> -> <publish:Miscellaneous.GetPropertyFromStagingDefinition record="{redirect}" propertyName="{name}" stagingLevel="local"/>
 </f:for>
 	</f:then><f:else>
-<f:translate key="record.state.{redirect.record.state}" />
+<f:translate key="record.state.{redirect.state}" />
 	</f:else></f:if>
 </html>