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

UserController: Remove redundant error handling 

refs #8826
This commit is contained in:
Johannes Meyer 2015-05-27 08:53:34 +02:00
parent e0f0fbf1cc
commit 676d20920b
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/UserController.php
View File

@ -64,17 +64,11 @@ class UserController extends AuthBackendController
$query->applyFilter($filterEditor->getFilter()); $query->applyFilter($filterEditor->getFilter());
$this->setupFilterControl($filterEditor); $this->setupFilterControl($filterEditor);
try {
$this->setupPaginationControl($query);
$this->view->users = $query; $this->view->users = $query;
} catch (Exception $e) {
Notification::error($e->getMessage());
Logger::error($e);
}
$this->view->backend = $backend; $this->view->backend = $backend;
$this->createListTabs()->activate('user/list'); $this->createListTabs()->activate('user/list');
$this->setupPaginationControl($query);
$this->setupLimitControl(); $this->setupLimitControl();
$this->setupSortControl( $this->setupSortControl(
array( array(

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

@ -26,11 +26,6 @@ if ($backend === null) {
$reducible = $backend instanceof Reducible; $reducible = $backend instanceof Reducible;
} }
if (! isset($users)) {
echo $this->translate('Failed to fetch any users') . '</div>';
return;
}
if (count($users) > 0): ?> if (count($users) > 0): ?>
<table data-base-target="_next" class="action user-list"> <table data-base-target="_next" class="action user-list">
<thead> <thead>