tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Throw NotFoundError instead of InvalidArgumentException in RoleForm::load()

Browse Source
This commit is contained in:
Eric Lippmann 2015-08-27 13:57:10 +02:00
parent c5d0094e8e
commit 13131cb3f6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/forms/Security/RoleForm.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Forms\Security; namespace Icinga\Forms\Security;
use Icinga\Exception\NotFoundError;
use InvalidArgumentException; use InvalidArgumentException;
use LogicException; use LogicException;
use Zend_Form_Element; use Zend_Form_Element;
@ -170,10 +171,10 @@ class RoleForm extends ConfigForm
throw new LogicException(sprintf('Can\'t load role \'%s\'. Config is not set', $name)); throw new LogicException(sprintf('Can\'t load role \'%s\'. Config is not set', $name));
} }
if (! $this->config->hasSection($name)) { if (! $this->config->hasSection($name)) {
throw new InvalidArgumentException(sprintf( throw new NotFoundError(
$this->translate('Can\'t load role \'%s\'. Role does not exist'), $this->translate('Can\'t load role \'%s\'. Role does not exist'),
$name $name
)); );
} }
$role = $this->config->getSection($name)->toArray(); $role = $this->config->getSection($name)->toArray();
$role['permissions'] = ! empty($role['permissions']) $role['permissions'] = ! empty($role['permissions'])