diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index b583fba066..082272cade 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -33,7 +33,8 @@ User Management ::
| @lang('admin/users/table.name') |
@lang('admin/users/table.email') |
- @lang('admin/users/table.checkedout') |
+ Assets |
+ Licenses |
@lang('admin/users/table.activated') |
@lang('admin/users/table.last_login') |
@lang('admin/users/table.created_at') |
@@ -50,10 +51,8 @@ User Management ::
{{ $user->email }} |
-
- {{ ($user->assets->count()) }}
- |
-
+ {{ $user->assets->count() }} |
+ {{ $user->licenses->count() }} |
{{ $user->isActivated() ? '' : ''}} |
@if (is_object($user->last_login))
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index 119f1b5e69..3f56906811 100644
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -70,6 +70,48 @@ View User {{ $user->fullName() }} ::
@endif
+ Software Checked Out to {{ $user->first_name }}
+
+
+ @if (count($user->licenses) > 0)
+
+
+
+ | Asset Type |
+ Serial |
+ Name |
+ Actions |
+
+
+
+ @foreach ($user->licenses as $license)
+
+ |
+ @if ($license->physical=='0')
+ Hardware
+ @else
+ Software
+ @endif
+ |
+ {{ $license->serial }} |
+ {{ $license->name }} |
+
+ Checkin |
+
+ @endforeach
+
+
+ @else
+
+
+
+
+ @lang('admin/users/table.noresults')
+
+
+ @endif
+
+
History for {{ $user->first_name }}
|