tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GroupController: Behave nicely when it's not possible to fetch any groups 

refs #8826
This commit is contained in:
Johannes Meyer 2015-05-13 13:50:32 +02:00
parent 8927121266
commit 5db6fc9ba9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/GroupController.php
View File

@ -1,12 +1,14 @@
<?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
use \Exception;
use \Zend_Controller_Action_Exception;
use Icinga\Application\Config;
use Icinga\Authentication\UserGroup\UserGroupBackend;
use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
use Icinga\Web\Controller;
use Icinga\Web\Form;
use Icinga\Web\Notification;
use Icinga\Web\Widget;
class GroupController extends Controller
@ -74,12 +76,17 @@ class GroupController extends Controller
$query->applyFilter($filterEditor->getFilter());
$this->setupFilterControl($filterEditor);
$this->getTabs()->activate('group/list');
try {
$this->view->groups = $query->paginate();
$this->setupPaginationControl($this->view->groups);
} catch (Exception $e) {
Notification::error($e->getMessage());
}
$this->view->backend = $backend;
$this->view->groups = $query->paginate();
$this->getTabs()->activate('group/list');
$this->setupLimitControl();
$this->setupPaginationControl($this->view->groups);
$this->setupSortControl(
array(
'group_name' => $this->translate('Group'),

5
application/views/scripts/group/list.phtml
View File

@ -18,6 +18,11 @@ if ($backend === null) {
return;
}
if (! isset($groups)) {
echo $this->translate('Failed to fetch any groups') . '</div>';
return;
}
if (count($groups) === 0) {
echo $this->translate('No groups found matching the filter') . '</div>';
return;