Fixes #2134 - hide archived assets from list all

Author: snipe

app/Http/Controllers/AssetsController.php

@@ -1676,6 +1676,9 @@ public function getDatatable(Request $request, $status = null)
             case 'Deployed':
                 $assets->Deployed();
                 break;
+            default:
+                $assets->NotArchived();
+                break;
 
         }
 

app/Models/Asset.php

@@ -628,6 +628,23 @@ public function scopeUndeployable($query)
         });
     }
 
+    /**
+     * Query builder scope for non-Archived assets
+     *
+     * @param  Illuminate\Database\Query\Builder $query Query builder instance
+     *
+     * @return Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeNotArchived($query)
+    {
+
+        return $query->whereHas('assetstatus', function ($query) {
+
+            $query->where('archived', '=', 0);
+        });
+    }
+
   /**
    * Query builder scope for Archived assets
    *