diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 66efb030ae..ae8def0890 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -75,7 +75,7 @@ class UsersController extends Controller 'users.autoassign_licenses', 'users.website', - ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',) + ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy') ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_user_count', 'managedLocations as manages_location_count'); @@ -253,7 +253,7 @@ class UsersController extends Controller 'consumables_count', 'accessories_count', 'manages_user_count', - 'managed_locations_count', + 'manages_locations_count', 'phone', 'address', 'city', diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 5befc8abb6..5ecc2ed6d8 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -21,6 +21,11 @@ class UsersTransformer public function transformUser(User $user) { + \Log::debug('users count: '.$user->manages_users_count); + \Log::debug('locations count: '.$user->manages_locations_count); + \Log::debug('users count method: '.$user->managesUsers()->count()); + \Log::debug('locations count method: '.$user->managedLocations()->count()); + \Log::debug('-----------'); $array = [ 'id' => (int) $user->id, 'avatar' => e($user->present()->gravatar), diff --git a/public/css/build/app.css b/public/css/build/app.css index 8f90c8128f..b478bebbe9 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index b07f925763..38dbbea0db 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 18cee0a522..7789546549 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 66a79fdf01..f8707dfe02 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=ae6071a2aee6a6cacdfa2a14cc27fac0", - "/css/build/app.css": "/css/build/app.css?id=941bcfefadb4f55d7edeb366b51f573b", + "/css/build/overrides.css": "/css/build/overrides.css?id=f27d47cadeee40c2b3ddd8b65ddafd65", + "/css/build/app.css": "/css/build/app.css?id=2f7abcd688deda0abb931c82c0d2a490", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=620b684d9dd9d3bb5fdda00a3a2467c3", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=cb1d0d1f0f925e59cf79bdf088e09aa8", + "/css/dist/all.css": "/css/dist/all.css?id=806674878c4c4d81a426203b30d90c98", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 423728d5c0..b92170d16b 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -621,6 +621,7 @@ th.css-padlock > .th-inner::before } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before @@ -643,18 +644,17 @@ th.css-envelope > .th-inner::before content: "\f0e0"; font-family: "Font Awesome 5 Free"; font-weight: 400; } - th.css-accessory > .th-inner::before { content: "\f11c"; font-family: "Font Awesome 5 Free"; font-weight: 400; } th.css-users > .th-inner::before { - content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-size: 15px; } th.css-location > .th-inner::before { - content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-size: 19px; margin-bottom: 0px; } diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 7a9d0f5793..225670c65d 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -89,7 +89,7 @@ - @if ($user->managedLocations()->count() >= 0 ) + @if ($user->managedLocations->count() >= 0 )
    • @endif - @if ($user->managesUsers()->count() >= 0 ) + @if ($user->managesUsers->count() >= 0 )