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

Fixes presenter issue on user history

Browse source
This commit is contained in:
snipe 2017-06-08 19:09:42 -07:00
parent a59db7062d
commit da2d9b2374
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,10 @@ class ReportsController extends Controller
$actionlogs = $actionlogs->TextSearch(e($request->input('search')));
}
if ($request->has('user_id')) {
$actionlogs = $actionlogs->where('target_id','=',$request->input('user_id'))->where('target_type','=','App\\Models\\User');
if (($request->has('target_type')) && ($request->has('target_id'))) {
$actionlogs = $actionlogs->where('target_id','=',$request->input('target_id'))
->where('target_type','=',"App\\Models\\".ucwords($request->input('target_type')));
}
if (($request->has('item_type')) && ($request->has('item_id'))) {

7
resources/views/users/view.blade.php
View file

@ -434,7 +434,7 @@
name="userActivityReport"
id="table4
data-sort-order="desc"
data-url="{{ route('api.activity.index', ['user_id' => $user->id]) }}">
data-url="{{ route('api.activity.index', ['target_id' => $user->id, 'target_type' => 'user']) }}">
<thead>
<tr>
<th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"></th>
@ -457,6 +457,7 @@
@stop
@section('moar_scripts')
@include ('partials.bootstrap-table', ['simple_view' => true])
<script>
$(function () {
//binds to onchange event of your input field
@ -515,7 +516,3 @@ $(function () {
@stop
@section('moar_scripts')
@include ('partials.bootstrap-table')
@stop