Merge branch '4.0' into 4.1

dnadesign · Sep 28, 2023 · 34aca8c · 34aca8c
2 parents 4530e21 + 65f2c18
commit 34aca8c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Control/ElementFormController.php b/src/Control/ElementFormController.php
@@ -70,9 +70,17 @@ public function finished()
      */
     public function Link($action = null)
     {
-        $id = $this->element->ID;
-        $segment = Controller::join_links('element', $id, $action);
         $page = Director::get_current_page();
+        $id = $this->element->ID;
+
+        if ($this->getAction() === 'finished'
+            && $action !== 'finished'
+            && $this->getRequest()->param('ID') == $id
+        ) {
+            $segment = $action;
+        } else {
+            $segment = Controller::join_links('element', $id, $action);
+        }
 
         if ($page && !($page instanceof ElementController)) {
             return $page->Link($segment);

diff --git a/src/Model/ElementForm.php b/src/Model/ElementForm.php
@@ -34,9 +34,10 @@ public function Form()
     {
         $controller = UserDefinedFormController::create($this);
         $current = Controller::curr();
-        $controller->setRequest($current->getRequest());
+        $request = $current->getRequest();
+        $controller->setRequest($request);
 
-        if ($current && $current->getAction() == 'finished') {
+        if ($current && $current->getAction() == 'finished' && $request->param('ID') == $this->ID) {
             return $controller->renderWith(UserDefinedFormController::class .'_ReceivedFormSubmission');
         }