lindeas
/
jilo-web
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Fixes logs search

main
Yasen Pramatarov 2025-01-18 17:41:03 +02:00
parent e85292b58f
commit 35020a0108
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/pages/logs.php
View File

@ -50,27 +50,27 @@ if ($scope === 'system' && isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
$items_per_page = 15; $items_per_page = 15;
$offset = ($currentPage - 1) * $items_per_page; $offset = ($currentPage - 1) * $items_per_page;
// Get filter from request or default to empty
$filter = $_REQUEST['filter'] ?? '';
// Build params for pagination // Build params for pagination
$params = ''; $params = '';
if (!empty($filter)) { if (!empty($_REQUEST['from_time'])) {
$params .= '&filter=' . urlencode($filter); $params .= '&from_time=' . urlencode($_REQUEST['from_time']);
} }
if (isset($_REQUEST['from'])) { if (!empty($_REQUEST['until_time'])) {
$params .= '&from=' . urlencode($_REQUEST['from']); $params .= '&until_time=' . urlencode($_REQUEST['until_time']);
} }
if (isset($_REQUEST['until'])) { if (!empty($_REQUEST['message'])) {
$params .= '&until=' . urlencode($_REQUEST['until']); $params .= '&message=' . urlencode($_REQUEST['message']);
}
if (!empty($_REQUEST['id'])) {
$params .= '&id=' . urlencode($_REQUEST['id']);
} }
if (isset($_REQUEST['tab'])) { if (isset($_REQUEST['tab'])) {
$params .= '&tab=' . urlencode($_REQUEST['tab']); $params .= '&tab=' . urlencode($_REQUEST['tab']);
} }
// prepare the result // prepare the result
$search = $logObject->readLog($user_id, $scope, $offset, $items_per_page, $filter); $search = $logObject->readLog($user_id, $scope, $offset, $items_per_page, $filters);
$search_all = $logObject->readLog($user_id, $scope, '', '', $filter); $search_all = $logObject->readLog($user_id, $scope, '', '', $filters);
if (!empty($search)) { if (!empty($search)) {
// we get total items and number of pages // we get total items and number of pages
@ -105,16 +105,15 @@ if (!empty($search)) {
// prepare the widget // prepare the widget
$widget['full'] = false; $widget['full'] = false;
$widget['collapsible'] = false;
$widget['name'] = 'Logs'; $widget['name'] = 'Logs';
$username = $userObject->getUserDetails($user_id)[0]['username']; $username = $userObject->getUserDetails($user_id)[0]['username'];
$widget['title'] = "Log events"; $widget['title'] = "Log events";
$widget['filter'] = true; $widget['filter'] = true;
$widget['scope'] = $scope; $widget['scope'] = $scope;
$widget['has_system_access'] = $has_system_access; $widget['has_system_access'] = $has_system_access;
if (!empty($logs['records'])) { if (!empty($logs['records'])) {
$widget['full'] = true; $widget['full'] = true;
$widget['table_headers'] = array_keys($logs['records'][0]);
$widget['table_records'] = $logs['records']; $widget['table_records'] = $logs['records'];
} }
$widget['pagination'] = true; $widget['pagination'] = true;