Skip to content

A free open source IT asset/license management system

Better handle manufacturer in info panel

snipe26382eb0a1ab
diff --git a/resources/views/blade/info-panel/index.blade.php b/resources/views/blade/info-panel/index.blade.php
index 2fdc491bb7..91090e28f3 100644
--- a/resources/views/blade/info-panel/index.blade.php
+++ b/resources/views/blade/info-panel/index.blade.php
@@ -274,7 +274,7 @@
<x-info-panel.supplier :infoPanelObj="$infoPanelObj"/>
- <x-info-panel.manufacturer :asset="$infoPanelObj" :manufacturer="($infoPanelObj->manufacturer ?? $infoPanelObj->model?->manufacturer)"/>
+ <x-info-panel.manufacturer :infoPanelObj="$infoPanelObj" :manufacturer="($infoPanelObj->manufacturer ?? $infoPanelObj->model?->manufacturer)"/>
@if ((isset($infoPanelObj->parent)) && ($infoPanelObj->parent))
@php
diff --git a/resources/views/blade/info-panel/manufacturer.blade.php b/resources/views/blade/info-panel/manufacturer.blade.php
index 39ebe65498..ddf9b0532e 100644
--- a/resources/views/blade/info-panel/manufacturer.blade.php
+++ b/resources/views/blade/info-panel/manufacturer.blade.php
@@ -1,6 +1,7 @@
@props([
- 'manufacturer' => null,
- 'asset' => null,
+ 'infoPanelObj' => null,
+ 'manufacturer' => $infoPanelObj->model?->manufacturer ?? $infoPanelObj->manufacturer,
+
])
@@ -35,10 +36,10 @@
@endif
- @if(($asset) && ($asset->manufacturer) && ($asset->manufacturer->warranty_lookup_url))
+ @if ($manufacturer->warranty_lookup_url)
<x-icon type="external-link" class="fa-fw"/>
<x-info-element.url>
- {{ $asset->present()->dynamicUrl($asset->manufacturer->warranty_lookup_url) }}
+ {{ $manufacturer->present()->dynamicUrl($manufacturer->warranty_lookup_url) }}
</x-info-element.url>
<br>
@endif
@@ -51,10 +52,10 @@
<br>
@endif
- @if(($asset) && ($asset->manufacturer) && ($asset->manufacturer->support_url))
+ @if($manufacturer->support_url)
<x-icon type="external-link" class="fa-fw"/>
<x-info-element.url>
- {{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
+ {{ $manufacturer->present()->dynamicUrl($manufacturer->support_url) }}
</x-info-element.url>
<br>
@endif