From da2d9b23743095db49c32a803ec510c6c29f1d8a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 8 Jun 2017 19:09:42 -0700
Subject: [PATCH] Fixes presenter issue on user history

---
 app/Http/Controllers/Api/ReportsController.php | 6 ++++--
 resources/views/users/view.blade.php           | 7 ++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 71b33e6d5..09f73f4cd 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -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'))) {
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 4c0654f27..0891ecfe0 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -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