Merge pull request #13473 from snipe/fixes/check_for_company_on_labels

Check that there is a company before trying to get name property
snipe · Aug 16, 2023 · eacbde3 · eacbde3
2 parents 7eaf317 + 74384f1
commit eacbde3
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/app/View/Label.php b/app/View/Label.php
@@ -39,7 +39,7 @@ public function render(callable $callback = null)
         $assets = $this->data->get('assets');
         $offset = $this->data->get('offset');
         $template = $this->data->get('template');
-        
+
         // If disabled, pass to legacy view
         if ((!$settings->label2_enable) && (!$template)) {
             return view('hardware/labels')
@@ -49,8 +49,12 @@ public function render(callable $callback = null)
                 ->with('count', $this->data->get('count'));
         }
 
-        if (empty($template)) $template = LabelModel::find($settings->label2_template);
-        elseif (is_string($template)) $template = LabelModel::find($template);
+        // If a specific template was set, use it, otherwise fall back to default
+        if (empty($template)) {
+            $template = LabelModel::find($settings->label2_template);
+        } elseif (is_string($template)) {
+            $template = LabelModel::find($template);
+        }
 
         $template->validate();
 
@@ -87,25 +91,36 @@ public function render(callable $callback = null)
                 $assetData->put('tag', $asset->asset_tag);
 
                 if ($template->getSupportTitle()) {
-                    $title = !empty($settings->label2_title) ?
-                        str_ireplace('{COMPANY}', $asset->company->name, $settings->label2_title) :
+
+                    if ($asset->company && !empty($settings->label2_title)) {
+                        $title = str_replace('{COMPANY}', $asset->company->name, $settings->label2_title);
                         $settings->qr_text;
-                    if (!empty($title)) $assetData->put('title', $title);
+                        $assetData->put('title', $title);
+                    }
                 }
 
                 if ($template->getSupportLogo()) {
-                    $logo = $settings->label2_asset_logo ?
-                        (
-                            !empty($asset->company->image) ? 
-                                Storage::disk('public')->path('companies/'.e($asset->company->image)) :
-                                null
-                        ) :
-                        (
-                            !empty($settings->label_logo) ?
-                                Storage::disk('public')->path(''.e($settings->label_logo)) :
-                                null
-                        );
-                    if (!empty($logo)) $assetData->put('logo', $logo);
+
+                    $logo = null;
+
+                    // Should we be trying to use a logo at all?
+                    if ($settings->label2_asset_logo='1') {
+
+                        // If we don't have a company image, fall back to the general site label image
+                        if (!empty($settings->label_logo)) {
+                            $logo = Storage::disk('public')->path('/'.e($settings->label_logo));
+                        }
+
+                        // If we have a company logo, use that first
+                        if (($asset->company) && ($asset->company->image!='')) {
+                            $logo = Storage::disk('public')->path('companies/'.e($asset->company->image));
+                        }
+
+                    }
+
+                    if (!empty($logo)) {
+                        $assetData->put('logo', $logo);
+                    }
                 }
 
                 if ($template->getSupport1DBarcode()) {

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
@@ -128,7 +128,7 @@ class="table table-striped snipe-table"
 
                                     <label class="form-control">
                                         <input type="checkbox" value="1" name="label2_asset_logo"{{ ((old('label2_asset_logo') == '1') || ($setting->label2_asset_logo) == '1') ? ' checked="checked"' : '' }} aria-label="label2_asset_logo">
-                                        {{ trans('general.yes') }}
+                                        {{ Form::label('label2_asset_logo', trans('admin/settings/general.label2_asset_logo')) }}
                                     </label>
                                     <p class="help-block">
                                         {!! trans('admin/settings/general.label2_asset_logo_help', ['setting_name' => trans('admin/settings/general.brand').' &gt; '.trans('admin/settings/general.label_logo')]) !!}