Some advanced search query tweaks

2017-10-18 10:07:35 -07:00
parent 5519e2d4ae
commit 3b012f2827
2 changed files with 28 additions and 28 deletions
@@ -86,16 +86,16 @@ class AssetsController extends Controller
        $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with(
            'assetloc', 'assetstatus', 'defaultLoc', 'assetlog', 'company',
            'model.category', 'model.manufacturer', 'model.fieldset','supplier');
-        // If we should search on everything
-        if (($request->has('search')) && (count($filter) == 0)) {
+
+
+        if (count($filter) > 0) {
+            $assets->ByFilter($filter);
+        } elseif ($request->has('search')) {
            $assets->TextSearch($request->input('search'));
-        // otherwise loop through the filters and search strictly on them
-        } else {
-            if (count($filter) > 0) {
-                $assets->ByFilter($filter);
-            }
        }

+
+
        // These are used by the API to query against specific ID numbers
        if ($request->has('status_id')) {
            $assets->where('status_id', '=', $request->input('status_id'));