mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Fixed #6491 - cleaner return methods for PHP 7.3 compact()
This commit is contained in:
parent
4ffb8f14b8
commit
ea1b792a93
|
@ -31,7 +31,7 @@ final class CompaniesController extends Controller
|
||||||
{
|
{
|
||||||
$this->authorize('view', Company::class);
|
$this->authorize('view', Company::class);
|
||||||
|
|
||||||
return view('companies/index')->with('companies', Company::all());
|
return view('companies/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -34,7 +34,7 @@ class DepreciationsController extends Controller
|
||||||
$this->authorize('view', Depreciation::class);
|
$this->authorize('view', Depreciation::class);
|
||||||
|
|
||||||
// Show the page
|
// Show the page
|
||||||
return view('depreciations/index', compact('depreciations'));
|
return view('depreciations/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ class GroupsController extends Controller
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
// Show the page
|
// Show the page
|
||||||
return view('groups/index', compact('groups'));
|
return view('groups/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -44,7 +44,7 @@ class LocationsController extends Controller
|
||||||
$locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();
|
$locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();
|
||||||
|
|
||||||
// Show the page
|
// Show the page
|
||||||
return view('locations/index', compact('locations'));
|
return view('locations/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ class ManufacturersController extends Controller
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
$this->authorize('index', Manufacturer::class);
|
$this->authorize('index', Manufacturer::class);
|
||||||
return view('manufacturers/index', compact('manufacturers'));
|
return view('manufacturers/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ class StatuslabelsController extends Controller
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
$this->authorize('view', Statuslabel::class);
|
$this->authorize('view', Statuslabel::class);
|
||||||
return view('statuslabels.index', compact('statuslabels'));
|
return view('statuslabels.index');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function show($id)
|
public function show($id)
|
||||||
|
|
|
@ -34,10 +34,9 @@ class SuppliersController extends Controller
|
||||||
{
|
{
|
||||||
// Grab all the suppliers
|
// Grab all the suppliers
|
||||||
$this->authorize('view', Supplier::class);
|
$this->authorize('view', Supplier::class);
|
||||||
$suppliers = Supplier::orderBy('created_at', 'DESC')->get();
|
|
||||||
|
|
||||||
// Show the page
|
// Show the page
|
||||||
return view('suppliers/index', compact('suppliers'));
|
return view('suppliers/index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ class ViewAssetsController extends Controller
|
||||||
$assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get();
|
$assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get();
|
||||||
$models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
|
$models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
|
||||||
|
|
||||||
return view('account/requestable-assets', compact('user', 'assets', 'models'));
|
return view('account/requestable-assets', compact('assets', 'models'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue