From 1fa624420e36cd3789a320f1098d57b1b4598473 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 10 Nov 2022 16:46:49 +0000
Subject: [PATCH] Removed unneeded relationships

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ViewAssetsController.php | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index 63267cbd05..edd1671ecf 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -8,6 +8,7 @@ use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
+use App\Models\CustomField;
 use App\Notifications\RequestAssetCancelation;
 use App\Notifications\RequestAssetNotification;
 use Illuminate\Http\Request;
@@ -29,23 +30,28 @@ class ViewAssetsController extends Controller
     public function getIndex()
     {
         $user = User::with(
+            'assets',
             'assets.model',
+            'assets.model.fieldset.fields',
             'consumables',
             'accessories',
             'licenses',
-            'userloc',
-            'userlog'
-        )->withTrashed()->find(Auth::user()->id);
+        )->find(Auth::user()->id);
 
-        $userlog = $user->userlog->load('item', 'user', 'target');
+
+        foreach ($user->assets as $asset) {
+            foreach ($asset->model->fieldset->fields as $field) {
+                $field_array[$field->db_column] = $field->name;
+            }
+        }
+
+        array_unique($field_array);
 
         if (isset($user->id)) {
-            return view('account/view-assets', compact('user', 'userlog'))
+            return view('account/view-assets', compact('user', 'field_array' ))
                 ->with('settings', Setting::getSettings());
-        } else {
-            // Redirect to the user management page
-            return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
         }
+
         // Redirect to the user management page
         return redirect()->route('users.index')
             ->with('error', trans('admin/users/message.user_not_found', $user->id));