diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index a419256511..b0f0eac286 100755
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -31,8 +31,8 @@ class DashboardController extends Controller
if (Auth::user()->hasAccess('admin')) {
$recent_activity = Actionlog::orderBy('created_at', 'DESC')
- ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog')
- ->take(7)
+ ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog', 'componentlog')
+ ->take(30)
->get();
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index a9599f68bf..0a320c4d43 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -90,9 +90,9 @@
| {{ trans('general.date') }} |
{{ trans('general.admin') }} |
- {{ trans('table.item') }} |
{{ trans('table.actions') }} |
- {{ trans('general.user') }} |
+ {{ trans('table.item') }} |
+ To |
@@ -106,7 +106,9 @@
@endif
-
+
+ {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
+ |
@if (($activity->assetlog) && ($activity->asset_type=="hardware"))
{{ $activity->assetlog->showAssetName() }}
@@ -118,19 +120,22 @@
{{ $activity->accessorylog->name }}
@elseif (($activity->componentlog) && ($activity->asset_type=="component"))
{{ $activity->componentlog->name }}
+ @elseif (($activity->assetlog) && ($activity->action_type=="uploaded"))
+ {{ $activity->assetlog->showAssetName() }}
@else
{{ trans('general.bad_data') }}
@endif
|
+
- {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
- |
-
- @if ($activity->action_type=='requested')
+ @if (($activity->componentlog) && ($activity->asset_type=="component"))
+ {{ $activity->assetlog->showAssetName() }}
+ @elseif($activity->action_type=='requested')
{{ $activity->adminlog->fullName() }}
@elseif ($activity->userlog)
{{ $activity->userlog->fullName() }}
+
@endif
|