From 513a1b1e3b9f4a2b71f04f02cd1cc9a250d3ba4b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Nov 2017 12:52:44 -0700 Subject: [PATCH 1/2] Bumped version --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index bae4cf7b2..39f9998d9 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,7 @@ 'v4.1.1', - 'build_version' => '46', - 'hash_version' => 'g28a4293', - 'full_hash' => 'v4.1.1-46-g28a4293', + 'app_version' => 'v4.1.2', + 'build_version' => '48', + 'hash_version' => 'gd21c92f', + 'full_hash' => 'v4.1.2-48-gd21c92f', ); From 87affa40edcf2f427f9bd21af84236c28b372909 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Nov 2017 13:01:09 -0700 Subject: [PATCH 2/2] Fixes filtering on status label --- app/Models/Asset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index eefc8b88a..dd9b4389f 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -935,7 +935,7 @@ class Asset extends Depreciable } } - if ($fieldname!='category') { + if (($fieldname!='category') && ($fieldname!='status_label')) { $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%'); }