From 2f68489cac8a6fcb5f310f830da65bba11ac855c Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 Mar 2018 17:55:57 +0200 Subject: [PATCH] DirectorDb: do not fail when unconfigured and... ...not use by Controllers --- library/Director/Web/Controller/Extension/DirectorDb.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/Director/Web/Controller/Extension/DirectorDb.php b/library/Director/Web/Controller/Extension/DirectorDb.php index 9f4eeb64..6d82b4c0 100644 --- a/library/Director/Web/Controller/Extension/DirectorDb.php +++ b/library/Director/Web/Controller/Extension/DirectorDb.php @@ -4,6 +4,7 @@ namespace Icinga\Module\Director\Web\Controller\Extension; use Icinga\Exception\ConfigurationError; use Icinga\Module\Director\Db; +use Icinga\Module\Director\Web\Controller\ActionController; trait DirectorDb { @@ -21,12 +22,14 @@ trait DirectorDb $resourceName = $this->Config()->get('db', 'resource'); if ($resourceName) { $this->db = Db::fromResourceName($resourceName); - } else { + } elseif ($this instanceof ActionController) { if ($this->getRequest()->isApiRequest()) { throw new ConfigurationError('Icinga Director is not correctly configured'); } else { $this->redirectNow('director'); } + } else { + throw new ConfigurationError('Icinga Director is not correctly configured'); } }