DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added filter to report by user_id for activity

Browse source
This commit is contained in:
snipe 2017-05-23 14:30:29 -07:00
parent 452c52a3ab
commit b1fa25b73e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,13 +20,20 @@ class ReportsController extends Controller
{ {
$actionlogs = Actionlog::with('item', 'user', 'target'); $actionlogs = Actionlog::with('item', 'user', 'target');
//$activitylogs = $activitylogs->Company::scopeCompanyables($activitylogs);
if ($request->has('search')) { if ($request->has('search')) {
$actionlogs = $actionlogs->TextSearch(e($request->input('search'))); $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
} }
$allowed_columns = ['created_at']; if ($request->has('user_id')) {
$actionlogs = $actionlogs->where('target_id','=',$request->input('user_id'))->where('target_type','=','App\\Models\\User');
}
$allowed_columns = [
'id',
'created_at'
];
$sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$offset = request('offset', 0); $offset = request('offset', 0);