DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2016-12-01 00:55:00 -08:00
parent 5bca1ed2b6
commit d8d800bb7a
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/AssetMaintenancesController.php
View file

@ -76,8 +76,7 @@ class AssetMaintenancesController extends Controller
*/
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')));

3
app/Models/Asset.php
View file

@ -329,8 +329,7 @@ class Asset extends Depreciable
{
return $this->hasMany('\App\Models\AssetMaintenance', 'asset_id')
->orderBy('created_at', 'desc')
->withTrashed();
->orderBy('created_at', 'desc');
}
/**