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

Form: handle API requests as expected

Browse Source 
refs #2749
This commit is contained in:
Alexander A. Klimov 2017-02-14 11:15:11 +01:00 committed by Eric Lippmann
parent 880a0a254f
commit 235e75d054
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1143,7 +1143,7 @@ class Form extends Zend_Form
} }
$formData = $this->getRequestData(); $formData = $this->getRequestData();
if ($this->getIsApiTarget() || $this->getUidDisabled() || $this->wasSent($formData)) { if ($this->getIsApiTarget() || $this->getRequest()->isApiRequest() || $this->getUidDisabled() || $this->wasSent($formData)) {
if (($frameUpload = (bool) $request->getUrl()->shift('_frameUpload', false))) { if (($frameUpload = (bool) $request->getUrl()->shift('_frameUpload', false))) {
$this->getView()->layout()->setLayout('wrapped'); $this->getView()->layout()->setLayout('wrapped');
} }
@ -1172,7 +1172,7 @@ class Form extends Zend_Form
} else { } else {
$this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl(); $this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
} }
} elseif ($this->getIsApiTarget()) { } elseif ($this->getIsApiTarget() || $this->getRequest()->isApiRequest()) {
$this->getResponse()->json()->setFailData($this->getMessages())->sendResponse(); $this->getResponse()->json()->setFailData($this->getMessages())->sendResponse();
} }
} elseif ($this->getValidatePartial()) { } elseif ($this->getValidatePartial()) {
@ -1198,7 +1198,7 @@ class Form extends Zend_Form
if (strtolower($this->getRequest()->getMethod()) !== $this->getMethod()) { if (strtolower($this->getRequest()->getMethod()) !== $this->getMethod()) {
return false; return false;
} }
if ($this->getIsApiTarget()) { if ($this->getIsApiTarget() || $this->getRequest()->isApiRequest()) {
return true; return true;
} }
if ($this->getSubmitLabel()) { if ($this->getSubmitLabel()) {