From c3a44f25fddf6505d08bde029a8b9d39cf9b18d8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 20 Dec 2017 12:32:55 -0800
Subject: [PATCH] Fixed #4663 - duplicate manufacturer name in selectlist

---
 app/Http/Controllers/Api/AssetModelsController.php | 2 +-
 app/Presenters/AssetModelPresenter.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 060946d9d5..4003511c9e 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -200,7 +200,7 @@ class AssetModelsController extends Controller
         $assetmodels = $assetmodels->OrderCategory('ASC')->OrderManufacturer('ASC')->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50);
 
         foreach ($assetmodels as $assetmodel) {
-            $assetmodel->use_text = (($assetmodel->category) ? e($assetmodel->category->name) : '').': '.(($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name) : '').' '.$assetmodel->present()->modelName;
+            $assetmodel->use_text = (($assetmodel->category) ? e($assetmodel->category->name) : '').': '.$assetmodel->present()->modelName;
             $assetmodel->use_image = ($assetmodel->image) ? url('/').'/uploads/models/'.$assetmodel->image : null;
         }
 
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index e38f80e91f..d1ea96bb74 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -47,7 +47,7 @@ class AssetModelPresenter extends Presenter
     {
         $name = '';
         if ($this->model->manufacturer) {
-            $name .= $this->model->manufacturer->name;
+            $name .= $this->model->manufacturer->name.' ';
         }
         $name .= $this->name;