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

Replace Form::onFailure() with Form::onShow() 

There is currently no usecase for onFailure() but for onShow() wherewith
the case is covered when a form needs to be prepared before showing it
to the user while the form was not submitted in any way.

refs #5525
This commit is contained in:
Johannes Meyer 2014-08-27 10:25:50 +02:00
parent d3c2fc858c
commit 0ff79b0948
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/Icinga/Web/Form.php
View File

@ -241,13 +241,13 @@ class Form extends Zend_Form
} }
/** /**
* Perform actions after this form was submitted using an invalid request * Perform actions when no form dependent data was sent
* *
* Intended to be implemented by concrete form classes. * Intended to be implemented by concrete form classes.
* *
* @param Request $request The invalid request supposed to process this form * @param Request $request The current request
*/ */
public function onFailure(Request $request) public function onShow(Request $request)
{ {
} }
@ -357,7 +357,8 @@ class Form extends Zend_Form
/** /**
* Process the given request using this form * Process the given request using this form
* *
* Redirects to the url set with setRedirectUrl() upon success. * Redirects to the url set with setRedirectUrl() upon success. See onSuccess()
* and onShow() wherewith you can customize the processing logic.
* *
* @param Request $request The request to be processed * @param Request $request The request to be processed
* *
@ -373,17 +374,15 @@ class Form extends Zend_Form
if ($this->wasSent($formData)) { if ($this->wasSent($formData)) {
$this->populate($formData); // Necessary to get isSubmitted() to work $this->populate($formData); // Necessary to get isSubmitted() to work
if ($this->isSubmitted()) { if ($this->isSubmitted()) {
if ($this->isValid($formData)) { if ($this->isValid($formData) && $this->onSuccess($request)) {
if ($this->onSuccess($request)) { $this->getResponse()->redirectAndExit($this->getRedirectUrl());
$this->getResponse()->redirectAndExit($this->getRedirectUrl());
}
} else {
$this->onFailure($request);
} }
} else { } else {
// The form can't be processed but we want to show validation errors though // The form can't be processed but we want to show validation errors though
$this->isValidPartial($formData); $this->isValidPartial($formData);
} }
} else {
$this->onShow($request);
} }
return $request; return $request;