A free open source IT asset/license management system
Fixed jobtitle in advanced search
snipe9604ecebadc2
diff --git a/app/Models/Asset.php b/app/Models/Asset.phpindex d5b640e40a..603dc064f4 100644--- a/app/Models/Asset.php+++ b/app/Models/Asset.php@@ -1893,6 +1893,30 @@ class Asset extends Depreciable);}+ if ($fieldname == 'jobtitle') {+ $query->where(function ($query) use ($search_val) {+ if (is_array($search_val)) {+ $query->whereHasMorph(+ 'assignedTo',+ [User::class],+ function ($query) use ($search_val) {+ $query->whereIn('users.jobtitle', $search_val);+ }+ );+ } else {+ $query->whereHasMorph(+ 'assignedTo',+ [User::class],+ function ($query) use ($search_val) {+ $query->where(function ($query) use ($search_val) {+ $query->where('users.jobtitle', 'LIKE', '%' . $search_val . '%');+ });+ }+ );+ }+ });+ }+/*** THIS CLUNKY BIT IS VERY IMPORTANT@@ -1917,7 +1941,7 @@ class Asset extends Depreciable*/if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')- && ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')+ && ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='jobtitle') && ($fieldname!='company') && ($fieldname!='manufacturer')) {$query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');}