ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-06-17 15:57:12 +01:00
parent e1ab9e959e d66b6cfee6
commit 1158851ea7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Presenters/HistoryPresenter.php
+7 -7
View File
@@ -110,7 +110,7 @@ class HistoryPresenter extends Presenter
],
[
'field' => 'file_download',
'searchable' => true,
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('general.download'),
@@ -144,22 +144,22 @@ class HistoryPresenter extends Presenter
],
[
'field' => 'remote_ip',
'searchable' => false,
'sortable' => false,
'searchable' => true,
'sortable' => true,
'visible' => false,
'title' => trans('admin/settings/general.login_ip'),
],
[
'field' => 'user_agent',
'searchable' => false,
'sortable' => false,
'searchable' => true,
'sortable' => true,
'visible' => false,
'title' => trans('admin/settings/general.login_user_agent'),
],
[
'field' => 'action_source',
'searchable' => false,
'sortable' => false,
'searchable' => true,
'sortable' => true,
'visible' => false,
'title' => trans('general.action_source'),
],
resources/views/reports/activity.blade.php
+2
View File
@@ -25,11 +25,13 @@
<div class="box-body">
<table
data-advanced-search="true"
data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout($serial = true) }}"
data-cookie-id-table="activityReport"
data-pagination="true"
data-id-table="activityReport"
data-search="true"
data-show-fullscreen="true"
data-search-highlight="true"
data-show-print="true"
data-side-pagination="server"