tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make Form base class more test friendly..

Browse Source 
refs #5525
This commit is contained in:
Johannes Meyer 2014-09-09 09:31:15 +02:00
parent c8ce1088c9
commit f7f6bcc447
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,8 +162,9 @@ class Form extends Zend_Form
public function getRedirectUrl() public function getRedirectUrl()
{ {
if ($this->redirectUrl === null) { if ($this->redirectUrl === null) {
$url = Url::fromRequest(array(), $this->getRequest());
// Be sure to remove all form dependent params because we do not want to submit it again // Be sure to remove all form dependent params because we do not want to submit it again
$this->redirectUrl = Url::fromRequest()->without(array_keys($this->getElements())); $this->redirectUrl = $url->without(array_keys($this->getElements()));
} }
return $this->redirectUrl; return $this->redirectUrl;
@ -312,7 +313,7 @@ class Form extends Zend_Form
if ($this->getAction() === '') { if ($this->getAction() === '') {
// We MUST set an action as JS gets confused otherwise, if // We MUST set an action as JS gets confused otherwise, if
// this form is being displayed in an additional column // this form is being displayed in an additional column
$this->setAction(Url::fromRequest()->getUrlWithout(array_keys($this->getElements()))); $this->setAction(Url::fromRequest()->without(array_keys($this->getElements())));
} }
$this->created = true; $this->created = true;