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

ActionController: fix REST API issue

This commit is contained in:
Thomas Gelf 2016-12-14 15:02:12 +01:00
parent 8841906aad
commit 068735021b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Director/Web/Controller/ActionController.php
View File

@ -11,6 +11,7 @@ use Icinga\Module\Director\Db;
use Icinga\Module\Director\IcingaConfig\IcingaConfig; use Icinga\Module\Director\IcingaConfig\IcingaConfig;
use Icinga\Module\Director\Monitoring; use Icinga\Module\Director\Monitoring;
use Icinga\Module\Director\Objects\IcingaEndpoint; use Icinga\Module\Director\Objects\IcingaEndpoint;
use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Web\Form\FormLoader; use Icinga\Module\Director\Web\Form\FormLoader;
use Icinga\Module\Director\Web\Form\QuickBaseForm; use Icinga\Module\Director\Web\Form\QuickBaseForm;
use Icinga\Module\Director\Web\Table\QuickTable; use Icinga\Module\Director\Web\Table\QuickTable;
@ -257,7 +258,7 @@ abstract class ActionController extends Controller
$this->prepareTable($name)->setViewScript('list/table'); $this->prepareTable($name)->setViewScript('list/table');
} }
protected function provideFilterEditorForTable(QuickTable $table) protected function provideFilterEditorForTable(QuickTable $table, IcingaObject $dummy = null)
{ {
$filterEditor = $table->getFilterEditor($this->getRequest()); $filterEditor = $table->getFilterEditor($this->getRequest());
$filter = $filterEditor->getFilter(); $filter = $filterEditor->getFilter();
@ -314,6 +315,10 @@ abstract class ActionController extends Controller
} }
if ($this->getRequest()->isApiRequest()) { if ($this->getRequest()->isApiRequest()) {
if ($dummy === null) {
throw new NotFoundError('Not accessible via API');
}
$objects = array(); $objects = array();
foreach ($dummy::loadAll($this->db) as $object) { foreach ($dummy::loadAll($this->db) as $object) {
$objects[] = $object->toPlainObject(false, true); $objects[] = $object->toPlainObject(false, true);