tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DirectorObjectForm: do not catch onSuccess failure 

...base clase already does
This commit is contained in:
Thomas Gelf 2017-09-13 10:50:34 +02:00
parent f7353b6628
commit 9be31df544
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -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();

2
library/Director/Web/Form/QuickForm.php
View File

@ -389,8 +389,6 @@ abstract class QuickForm extends QuickBaseForm
} else {
$this->setDefaults($post);
}
} else {
// Well...
}
return $this;