Fixed Error 404 when adding new contact [#14]

trilbymedia · Sep 26, 2019 · 1b1836f · 1b1836f
1 parent 97f0cbf
commit 1b1836f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
     * Fixed error caused by automatic path selection from cookie when destination not available [#23](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/23)
     * Fixed breadcrumb issue in Flex Pages List [#19](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/19)
     * Flex Pages: Fixed unable to change page template [#4](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/4)
+    * Fixed `Error 404` when adding new contact [#14](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/14)
 
 # v1.0.0-beta.8
 ##  09/19/2019

diff --git a/classes/Admin/AdminController.php b/classes/Admin/AdminController.php
@@ -611,8 +611,11 @@ public function taskSave()
 
             if (!$this->redirect) {
                 // TODO: remove 'action:add' after save.
-                if ($this->referrerRoute->getGravParam('action') === 'add' && !Utils::endsWith($this->currentRoute->toString(false), '/' . $object->getKey())) {
-                    $this->referrerRoute = $this->currentRoute->withAddedPath($object->getKey())->withGravParam('action', null);
+                if ($this->referrerRoute->getGravParam('action') === 'add') {
+                    $this->referrerRoute = $this->currentRoute->withGravParam('action', null);
+                    if (!Utils::endsWith($this->referrerRoute->toString(false), '/' . $object->getKey())) {
+                        $this->referrerRoute = $this->referrerRoute->withAddedPath($object->getKey());
+                    }
                 } elseif ($key !== $object->getKey()) {
                     $this->referrerRoute = $this->currentRoute->withRoute($this->currentRoute->getRoute(0, -1) . '/' . $object->getKey());
                 }