Fixes #2997 - don’t include soft-deleted maintenances

snipe · Dec 1, 2016 · d8d800b · d8d800b
1 parent 5bca1ed
commit d8d800b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
@@ -76,8 +76,7 @@ public function getIndex()
     */
     public function getDatatable()
     {
-        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company','admin')
-        ->withTrashed();
+        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company','admin');
 
         if (Input::has('search')) {
             $maintenances = $maintenances->TextSearch(e(Input::get('search')));

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -329,8 +329,7 @@ public function assetmaintenances()
     {
 
         return $this->hasMany('\App\Models\AssetMaintenance', 'asset_id')
-                  ->orderBy('created_at', 'desc')
-                  ->withTrashed();
+                  ->orderBy('created_at', 'desc');
     }
 
   /**