From 1e6c85da41d2d003b9865706b9963cb13d9e7f0f Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 24 May 2019 13:50:11 -0700 Subject: [PATCH] Removed custom fields from AssignedSearch to prevent confusing data in selectlist Fixes [ch9193] --- app/Models/Asset.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 03343f8c6c..fbb2dbad5a 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1038,9 +1038,7 @@ class Asset extends Depreciable ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%') ->orWhere('assets.notes', 'LIKE', '%'.$search.'%'); } - foreach (CustomField::all() as $field) { - $query->orWhere('assets.'.$field->db_column_name(), 'LIKE', "%$search%"); - } + })->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug }