mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Added deleted at value
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
02caa13222
commit
cc92d342ea
|
@ -644,13 +644,13 @@ class ReportsController extends Controller
|
|||
if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
|
||||
$assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
|
||||
}
|
||||
if($request->filled('exclude_archived')){
|
||||
if ($request->filled('exclude_archived')) {
|
||||
$assets->notArchived();
|
||||
}
|
||||
if($request->input('deleted_assets') == '1'){
|
||||
if ($request->input('deleted_assets') == '1') {
|
||||
$assets->withTrashed();
|
||||
}
|
||||
if($request->input('deleted_assets') == '0'){
|
||||
if ($request->input('deleted_assets') == '0') {
|
||||
$assets->onlyTrashed();
|
||||
}
|
||||
|
||||
|
@ -818,6 +818,10 @@ class ReportsController extends Controller
|
|||
$row[] = ($asset->updated_at) ? $asset->updated_at : '';
|
||||
}
|
||||
|
||||
if ($request->filled('deleted_at')) {
|
||||
$row[] = ($asset->deleted_at) ? $asset->deleted_at : '';
|
||||
}
|
||||
|
||||
if ($request->filled('last_audit_date')) {
|
||||
$row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue