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

Rename Icinga\Web\Form::onShow() to onRequest() 

onShow() is misleading because at the time this method is being called the
form is neither shown nor created.

refs #5525
This commit is contained in:
Johannes Meyer 2014-09-02 14:35:01 +02:00
parent d4c4ab7b2c
commit 39bb01b433
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms/Config/AuthenticationBackendConfigForm.php
View File

@ -231,11 +231,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
/** /**
* Populate the form in case an authentication backend is being edited * Populate the form in case an authentication backend is being edited
* *
* @see Form::onShow() * @see Form::onRequest()
* *
* @throws ConfigurationError In case the backend name is missing in the request or is invalid * @throws ConfigurationError In case the backend name is missing in the request or is invalid
*/ */
public function onShow(Request $request) public function onRequest(Request $request)
{ {
$authBackend = $request->getQuery('auth_backend'); $authBackend = $request->getQuery('auth_backend');
if ($authBackend !== null) { if ($authBackend !== null) {

4
application/forms/Config/GeneralConfigForm.php
View File

@ -60,9 +60,9 @@ class GeneralConfigForm extends ConfigForm
} }
/** /**
* @see Form::onShow() * @see Form::onRequest()
*/ */
public function onShow(Request $request) public function onRequest(Request $request)
{ {
$values = array(); $values = array();
foreach ($this->config as $section => $properties) { foreach ($this->config as $section => $properties) {

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

@ -321,7 +321,7 @@ class Form extends Zend_Form
* *
* @param Request $request The current request * @param Request $request The current request
*/ */
public function onShow(Request $request) public function onRequest(Request $request)
{ {
} }
@ -439,7 +439,7 @@ 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. See onSuccess() * Redirects to the url set with setRedirectUrl() upon success. See onSuccess()
* and onShow() wherewith you can customize the processing logic. * and onRequest() wherewith you can customize the processing logic.
* *
* @param Request $request The request to be processed * @param Request $request The request to be processed
* *
@ -465,7 +465,7 @@ class Form extends Zend_Form
$this->isValidPartial($formData); $this->isValidPartial($formData);
} }
} else { } else {
$this->onShow($request); $this->onRequest($request);
} }
return $request; return $request;