From 9be31df544d9d6462ff312dd29ed3ec209ea6f05 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 13 Sep 2017 10:50:34 +0200 Subject: [PATCH] DirectorObjectForm: do not catch onSuccess failure ...base clase already does --- .../Director/Web/Form/DirectorObjectForm.php | 38 ++++++++----------- library/Director/Web/Form/QuickForm.php | 2 - 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php index fa184b25..fba59dab 100644 --- a/library/Director/Web/Form/DirectorObjectForm.php +++ b/library/Director/Web/Form/DirectorObjectForm.php @@ -610,29 +610,23 @@ abstract class DirectorObjectForm extends DirectorForm public function onSuccess() { $object = $this->object(); - - try { - if ($object->hasBeenModified()) { - if (! $object->hasBeenLoadedFromDb()) { - $this->setHttpResponseCode(201); - } - - $msg = sprintf( - $object->hasBeenLoadedFromDb() - ? $this->translate('The %s has successfully been stored') - : $this->translate('A new %s has successfully been created'), - $this->translate($this->getObjectShortClassName()) - ); - $object->store($this->db); - } else { - if ($this->isApiRequest()) { - $this->setHttpResponseCode(304); - } - $msg = $this->translate('No action taken, object has not been modified'); + if ($object->hasBeenModified()) { + if (! $object->hasBeenLoadedFromDb()) { + $this->setHttpResponseCode(201); } - } catch (Exception $e) { - $this->addException($e); - return false; + + $msg = sprintf( + $object->hasBeenLoadedFromDb() + ? $this->translate('The %s has successfully been stored') + : $this->translate('A new %s has successfully been created'), + $this->translate($this->getObjectShortClassName()) + ); + $object->store($this->db); + } else { + if ($this->isApiRequest()) { + $this->setHttpResponseCode(304); + } + $msg = $this->translate('No action taken, object has not been modified'); } $this->setObjectSuccessUrl(); diff --git a/library/Director/Web/Form/QuickForm.php b/library/Director/Web/Form/QuickForm.php index 2ec9e103..83bf5cf8 100644 --- a/library/Director/Web/Form/QuickForm.php +++ b/library/Director/Web/Form/QuickForm.php @@ -389,8 +389,6 @@ abstract class QuickForm extends QuickBaseForm } else { $this->setDefaults($post); } - } else { - // Well... } return $this;