Replaced custom deleted query scopes with onlyTrashed()

This commit is contained in:
snipe
2019-01-24 14:47:44 -08:00
parent ffc51d6db6
commit d1fe7abb18
5 changed files with 2 additions and 50 deletions
-24
View File
@@ -440,18 +440,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
return $this->belongsToMany(Asset::class, 'checkout_requests', 'user_id', 'requestable_id')->whereNull('canceled_at');
}
/**
* Query builder scope to return deleted users
* @author A. Gianotto <snipe@snipe.net>
* @since [v2.0]
*
* @param string $query
* @return \Illuminate\Database\Query\Builder
*/
public function scopeGetDeleted($query)
{
return $query->withTrashed()->whereNotNull('users.deleted_at');
}
/**
* Query builder scope to return NOT-deleted users
@@ -591,18 +579,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
});
}
/**
* Query builder scope for Deleted users
*
* @param \Illuminate\Database\Query\Builder $query Query builder instance
* @return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeDeleted($query)
{
return $query->whereNotNull('deleted_at');
}
/**
* Query builder scope to order on manager