DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting

Browse source 
Changed `action_date` to `created_at` in activity report
This commit is contained in:
snipe 2024-09-25 18:32:21 +01:00 committed by GitHub
parent ba12204842 658c94ad8b
commit c1a887b48b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Api/ReportsController.php
View file

@ -75,6 +75,7 @@ class ReportsController extends Controller
'remote_ip',
'user_agent',
'action_source',
'action_date',
];

2
resources/views/reports/activity.blade.php
View file

@ -52,7 +52,7 @@
<th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">
{{ trans('admin/hardware/table.icon') }}
</th>
<th class="col-sm-3" data-searchable="false" data-sortable="true" data-field="action_date" data-formatter="dateDisplayFormatter">
<th class="col-sm-3" data-searchable="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">
{{ trans('general.date') }}
</th>
<th class="col-sm-2" data-searchable="true" data-sortable="true" data-field="created_by" data-formatter="usersLinkObjFormatter">