From 95a1a6b5537b233606f1e4dc84b04173cbe6b05c Mon Sep 17 00:00:00 2001 From: Dennis Prins Date: Wed, 24 Jul 2024 17:02:33 +0200 Subject: [PATCH] Update UserFormWidgetController.php --- src/Controller/UserFormWidgetController.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Controller/UserFormWidgetController.php b/src/Controller/UserFormWidgetController.php index 22f884f..5b294ab 100644 --- a/src/Controller/UserFormWidgetController.php +++ b/src/Controller/UserFormWidgetController.php @@ -84,17 +84,13 @@ public function Link($action = null) $this->setWidgetAndElementFromUrl($this->getRequest()->getURL()); } - return Controller::join_links(Director::baseURL(), self::$url_segment, $this->widget->ID, $this->element->ID, $action); + return Controller::join_links(Director::baseURL(), self::$url_segment, $this->widget->ID, $this->element?->ID ?: 0, $action); } public function Form() { $form = parent::Form(); - /** @var SiteTree $page */ - $page = $this->element->getPage(); - $form->Fields()->push(HiddenField::create('_PageUrl', '_PageUrl', $page->Link())); - if (!$this->widget) { $this->widget = UserFormWidget::get()->byID($this->getRequest()->param('WidgetID')); } @@ -104,6 +100,7 @@ public function Form() } if ($this->element) { + $form->Fields()->push(HiddenField::create('_PageUrl', '_PageUrl', $this->element->getPage()->Link())); $form->Fields()->push(HiddenField::create('ElementID', 'ElementID', $this->element->ID)); $form->Actions()->dataFieldByName('action_process')->addExtraClass($this->element->SubmitButtonColor); } @@ -155,7 +152,7 @@ public function process($data, $form) } /** @var ?Link $successLink */ - $successLink = $this->element->Widget()->SuccessPage(); + $successLink = $this->element ? $this->element->Widget()->SuccessPage() : $this->widget->SuccessPage(); return $this->redirect($successLink->getLinkURL()); }