mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 13:45:40 +00:00
Code Issues Projects Releases Wiki Activity

The assets method was renamed to assignedAssets in User class. Adjust places to reflect that

Browse Source
This commit is contained in:
Daniel Meltzer
2016-12-29 11:45:37 -05:00
parent fa974b93c0
commit aa2d3cf026
9 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/UsersController.php
View File

@ -364,9 +364,9 @@ class UsersController extends Controller
// Authorize takes care of many of our logic checks now.
$this->authorize('delete', User::class);
if ($user->assets()->count() > 0) {
if ($user->assignedAssets()->count() > 0) {
// Redirect to the user management page
return redirect()->route('users.index')->with('error', 'This user still has ' . $user->assets()->count() . ' assets associated with them.');
return redirect()->route('users.index')->with('error', 'This user still has ' . $user->assignedAssets()->count() . ' assets associated with them.');
}
if ($user->licenses()->count() > 0) {
@ -1132,7 +1132,7 @@ class UsersController extends Controller
// Open output stream
$handle = fopen('php://output', 'w');
User::with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle')->orderBy('created_at', 'DESC')->chunk(500, function($users) use($handle) {
User::with('assignedAssets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle')->orderBy('created_at', 'DESC')->chunk(500, function($users) use($handle) {
$headers=[
// strtolower to prevent Excel from trying to open it as a SYLK file
strtolower(trans('general.id')),
@ -1174,7 +1174,7 @@ class UsersController extends Controller
$user->email,
($user->manager) ? $user->manager->present()->fullName() : '',
($user->userloc) ? $user->userloc->name : '',
$user->assets->count(),
$user->assignedAssets->count(),
$user->licenses->count(),
$user->accessories->count(),
$user->consumables->count(),