Skip to content

A free open source IT asset/license management system

Small fixes

snipe2135efe8a992
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index b3d414c3e7..b10d2e804e 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -116,7 +116,7 @@ class IconHelper
case 'password':
return 'fa-solid fa-key';
case 'api-key':
- return 'fa-regular fa-user-secret';
+ return 'fas fa-user-secret';
case 'nav-toggle':
return 'fas fa-bars';
case 'dashboard':
diff --git a/resources/views/blade/info-panel/index.blade.php b/resources/views/blade/info-panel/index.blade.php
index fc7c6b5076..f040176b44 100644
--- a/resources/views/blade/info-panel/index.blade.php
+++ b/resources/views/blade/info-panel/index.blade.php
@@ -24,8 +24,20 @@
<div class="text-center">
@if (method_exists($infoPanelObj, 'isSuperUser'))
- <x-icon type="superadmin" class="fa-2x {{ ($infoPanelObj->isSuperUser()) ? 'text-danger' : 'text-warning'}}"/>
- <div class="{{ ($infoPanelObj->isSuperUser()) ? 'text-danger' : ' text-warning'}}" style="font-weight: bold">{{ ($infoPanelObj->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin_user')) }}</div>
+
+ @if (($infoPanelObj->isSuperUser()))
+ <x-icon type="superadmin" class="fa-2x text-danger"/>
+ <div class="text-danger" style="font-weight: bold">
+ {{ strtolower(trans('general.superuser')) }}
+ </div>
+
+ @elseif ($infoPanelObj->isAdmin())
+ <x-icon type="admin" class="fa-2x text-warning"/>
+ <div class="text-warning" style="font-weight: bold">
+ {{ strtolower(trans('general.admin_user')) }}
+ </div>
+ @endif
+
@endif
<a href="{{ $infoPanelObj->getImageUrl($img_path) }}" data-toggle="lightbox" data-type="image">
diff --git a/resources/views/blade/table/locations.blade.php b/resources/views/blade/table/locations.blade.php
index 69bfa42d40..2d74cb67c6 100644
--- a/resources/views/blade/table/locations.blade.php
+++ b/resources/views/blade/table/locations.blade.php
@@ -9,7 +9,6 @@
<!-- start locations tab pane -->
@can('view', \App\Models\Location::class)
- @include('partials.locations-bulk-actions')
<x-slot:bulkactions>
<x-table.bulk-actions
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index e8e33ea4ff..59945aecc5 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -58,8 +58,8 @@
</x-well>
</x-page-column>
- <x-page-column class="col-md-4" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">
- <x-well>
+ <x-page-column class="col-md-4">
+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">
<x-icon type="calendar" class="fa-fw"/>
<strong>{{ trans('general.start_date') }}</strong>
@if ($user->start_date != '')
@@ -72,7 +72,7 @@
</x-page-column>
<x-page-column class="col-md-4" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">
- <x-well>
+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">
<x-icon type="calendar" class="fa-fw {{ (($user->end_date!='' && $user->end_date < Carbon::now()) ? ' text-danger' : '') }}"/>
<strong>{{ trans('general.end_date') }}</strong>
@if ($user->end_date != '')
@@ -100,6 +100,8 @@
<span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
@elseif ($user->hasAccess('admin'))
<span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
+ @else
+ {{ $user->username }}
@endif
</x-data-row>
@@ -185,7 +187,6 @@
<br>
@endif
- @if($user->autoassign_licenses == '1')
@if ($user->autoassign_licenses == '1')
<x-icon type="checkmark" class="fa-fw text-success"/>
@else
@@ -193,7 +194,6 @@
@endif
{{ trans('general.autoassign_licenses') }}
<br>
- @endif
</x-well>
@@ -425,7 +425,7 @@
</x-tabs.pane>
- <x-tabs.pane name="files" :count="$user->accessories()->count()">
+ <x-tabs.pane name="files" :count="$user->uploads()->count()">
<x-table.files object_type="users" :object="$user"/>
</x-tabs.pane>
@@ -489,7 +489,7 @@
<x-table
name="userHistory_{{ $user->id }}"
- api_url="{{ route('api.activity.index', ['item_id' => $user->id, 'item_type' => 'asset']) }}"
+ api_url="{{ route('api.activity.index', ['item_id' => $user->id, 'item_type' => User::class]) }}"
:presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
export_filename="export-history-{{ str_slug($user->name) }}-{{ date('Y-m-d') }}"
/>