From ffae537400b62d15b68fe14b0cf44dce1d6f9a10 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Nov 2017 17:07:57 -0800
Subject: [PATCH] Check that the models are valid being trying to return a
 value in the ajax partials

---
 resources/views/partials/forms/edit/asset-select.blade.php      | 2 +-
 resources/views/partials/forms/edit/category-select.blade.php   | 2 +-
 resources/views/partials/forms/edit/department-select.blade.php | 2 +-
 .../views/partials/forms/edit/manufacturer-select.blade.php     | 2 +-
 resources/views/partials/forms/edit/model-select.blade.php      | 2 +-
 resources/views/partials/forms/edit/supplier-select.blade.php   | 2 +-
 resources/views/partials/forms/edit/user-select.blade.php       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index cf42207ab8..1f0c732a64 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -5,7 +5,7 @@
         <select class="js-data-ajax select2" data-endpoint="hardware" name="{{ $fieldname }}" style="width: 100%" id="assigned_asset_select"{{ (isset($multiple)) ? ' multiple="multiple"' : '' }}>
             @if ($asset_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $asset_id }}" selected="selected">
-                    {{ \App\Models\Asset::find($asset_id)->present()->fullName }}
+                    {{ (\App\Models\Asset::find($asset_id)) ? \App\Models\Asset::find($asset_id)->present()->fullName : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_asset') }}</option>
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index c8d5d11a9c..8a2e59b9f4 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -7,7 +7,7 @@
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
             @if ($category_id = Input::old($fieldname, $item->{$fieldname}))
                 <option value="{{ $category_id }}" selected="selected">
-                    {{ \App\Models\Category::find($category_id)->name }}
+                    {{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_category') }}</option>
diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index d68b9d6253..dadc1f9bb8 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -6,7 +6,7 @@
         <select class="js-data-ajax" data-endpoint="departments" name="{{ $fieldname }}" style="width: 100%" id="department_select">
             @if ($department_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $department_id }}" selected="selected">
-                    {{ \App\Models\Department::find($department_id)->name }}
+                    {{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_department') }}</option>
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index 186f7838fa..38ddb56362 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -7,7 +7,7 @@
         <select class="js-data-ajax" data-endpoint="manufacturers" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
             @if ($manufacturer_id = Input::old($fieldname, $item->{$fieldname}))
                 <option value="{{ $manufacturer_id }}" selected="selected">
-                    {{ \App\Models\Manufacturer::find($manufacturer_id)->name }}
+                    {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_manufacturer') }}</option>
diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index dd38f26d50..84e30f4a93 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -7,7 +7,7 @@
         <select class="js-data-ajax" data-endpoint="models" name="{{ $fieldname }}" style="width: 100%" id="model_select_id">
             @if ($model_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $model_id }}" selected="selected">
-                    {{ \App\Models\AssetModel::find($model_id)->name }}
+                    {{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_model') }}</option>
diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index 9bc7860a40..fc61a1eca8 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -6,7 +6,7 @@
         <select class="js-data-ajax" data-endpoint="suppliers" name="{{ $fieldname }}" style="width: 100%" id="supplier_select">
             @if ($supplier_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $supplier_id }}" selected="selected">
-                    {{ \App\Models\Supplier::find($supplier_id)->name }}
+                    {{ (\App\Models\Supplier::find($supplier_id)) ? \App\Models\Supplier::find($supplier_id)->name : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_supplier') }}</option>
diff --git a/resources/views/partials/forms/edit/user-select.blade.php b/resources/views/partials/forms/edit/user-select.blade.php
index 96c4429b57..6af8d07956 100644
--- a/resources/views/partials/forms/edit/user-select.blade.php
+++ b/resources/views/partials/forms/edit/user-select.blade.php
@@ -6,7 +6,7 @@
         <select class="js-data-ajax" data-endpoint="users" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select">
             @if ($user_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $user_id }}" selected="selected">
-                    {{ \App\Models\User::find($user_id)->present()->fullName }}
+                    {{ (\App\Models\User::find($user_id)) ? \App\Models\User::find($user_id)->present()->fullName : '' }}
                 </option>
             @else
                 <option value="">{{ trans('general.select_user') }}</option>