tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 22c3a55d25fd09729b63932d15e46b4d465fbf37 into 11251481dcac73721c363731e6f765e8cc55bcac

Browse Source
This commit is contained in:
Ravi Kumar Kempapura Srinivasa 2024-11-04 13:32:21 +00:00 committed by GitHub
commit 1fc92af099
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/ConfigController.php
View File

@ -129,13 +129,14 @@ class ConfigController extends Controller
'url' => 'config/modules'
))
->activate('modules');
$this->view->modules = Icinga::app()->getModuleManager()->select()
$modules = Icinga::app()->getModuleManager()->select()
->from('modules')
->order('enabled', 'desc')
->order('installed', 'asc')
->order('name');
$this->setupLimitControl();
$this->setupPaginationControl($this->view->modules);
$this->setupPaginationControl($modules);
$this->view->modules = $modules;
$this->view->title = $this->translate('Modules');
}

5
application/controllers/ListController.php
View File

@ -50,10 +50,11 @@ class ListController extends Controller
. 'T[0-9]{2}(?::[0-9]{2}){2}(?:[\+\-][0-9]{2}:[0-9]{2})?)' // time
. ' - (?<loglevel>[A-Za-z]+) - (?<message>.*)(?!.)/msS' // loglevel, message
)));
$this->view->logData = $resource->select()->order('DESC');
$logData = $resource->select()->order('DESC');
$this->setupLimitControl();
$this->setupPaginationControl($this->view->logData);
$this->setupPaginationControl($logData);
$this->view->logData = $logData;
$this->view->title = $this->translate('Application Log');
}
}

9
application/controllers/RoleController.php
View File

@ -59,7 +59,7 @@ class RoleController extends AuthBackendController
public function listAction()
{
$this->createListTabs()->activate('role/list');
$this->view->roles = (new RolesConfig())
$roles = (new RolesConfig())
->select();
$sortAndFilterColumns = [
@ -69,10 +69,11 @@ class RoleController extends AuthBackendController
'permissions' => $this->translate('Permissions')
];
$this->setupFilterControl($this->view->roles, $sortAndFilterColumns, ['name']);
$this->setupFilterControl($roles, $sortAndFilterColumns, ['name']);
$this->setupLimitControl();
$this->setupPaginationControl($this->view->roles);
$this->setupSortControl($sortAndFilterColumns, $this->view->roles, ['name']);
$this->setupPaginationControl($roles);
$this->setupSortControl($sortAndFilterColumns, $roles, ['name']);
$this->view->roles = $roles;
}
/**

2
modules/monitoring/application/controllers/ShowController.php
View File

@ -91,7 +91,7 @@ class ShowController extends Controller
$this->applyRestriction('monitoring/filter/objects', $notifications);
$this->view->notifications = $notifications;
$this->setupLimitControl();
$this->setupPaginationControl($this->view->notifications);
$this->setupPaginationControl($notifications);
$this->view->title = $contact->contact_name;
}

7
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -117,11 +117,12 @@ abstract class MonitoredObjectController extends Controller
public function historyAction()
{
$this->getTabs()->activate('history');
$this->view->history = $this->object->fetchEventhistory()->eventhistory;
$this->applyRestriction('monitoring/filter/objects', $this->view->history);
$history = $this->object->fetchEventhistory()->eventhistory;
$this->applyRestriction('monitoring/filter/objects', $history);
$this->setupLimitControl(50);
$this->setupPaginationControl($this->view->history, 50);
$this->setupPaginationControl($history, 50);
$this->view->history = $history;
$this->view->object = $this->object;
$this->render('object/detail-history', null, true);
}