Skip to content

A free open source IT asset/license management system

Fixed #18765 - viewKeys hiding serial for non-licenses

snipe334f27424e7e
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index 74a62f34f4..fa595c96ca 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -30,7 +30,7 @@ class LicensesTransformer
'name' => e($license->manufacturer->name),
'tag_color' => ($license->manufacturer->tag_color) ? e($license->manufacturer->tag_color) : null,
] : null,
- 'product_key' => (Gate::allows('viewKeys', License::class)) ? e($license->serial) : '------------',
+ 'product_key' => (Gate::allows('viewKeys', $license)) ? e($license->serial) : '------------',
'order_number' => ($license->order_number) ? e($license->order_number) : null,
'purchase_order' => ($license->purchase_order) ? e($license->purchase_order) : null,
'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'),
diff --git a/resources/views/blade/info-panel/index.blade.php b/resources/views/blade/info-panel/index.blade.php
index 71563d6144..6d26f06817 100644
--- a/resources/views/blade/info-panel/index.blade.php
+++ b/resources/views/blade/info-panel/index.blade.php
@@ -72,13 +72,13 @@
@endif
@if ($infoPanelObj->serial)
- @can('viewKeys', $infoPanelObj)
+ @if(($infoPanelObj::class != "App\Models\License") || (Gate::allows('viewKeys', $infoPanelObj)))
<x-info-element icon_type="number" title="{{ trans('general.serial_number') }}">
<x-copy-to-clipboard class="pull-right" copy_what="license_key">
<code>{{ $infoPanelObj->serial }}</code>
</x-copy-to-clipboard>
</x-info-element>
- @endcan
+ @endif
@endif