Moved gates to individual controller methods to fix “This action is unauthorized” in route:list

This commit is contained in:
snipe 2018-07-25 10:45:32 -07:00
parent 9535c68dfe
commit a9fd9c9e59

View file

@ -31,8 +31,6 @@ class ReportsController extends Controller
*/ */
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
$this->authorize('reports.view');
} }
/** /**
@ -44,6 +42,7 @@ class ReportsController extends Controller
*/ */
public function getAccessoryReport() public function getAccessoryReport()
{ {
$this->authorize('reports.view');
$accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get(); $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
return view('reports/accessories', compact('accessories')); return view('reports/accessories', compact('accessories'));
} }
@ -59,6 +58,7 @@ class ReportsController extends Controller
*/ */
public function exportAccessoryReport() public function exportAccessoryReport()
{ {
$this->authorize('reports.view');
$accessories = Accessory::orderBy('created_at', 'DESC')->get(); $accessories = Accessory::orderBy('created_at', 'DESC')->get();
$rows = array(); $rows = array();
@ -99,7 +99,7 @@ class ReportsController extends Controller
*/ */
public function getDeprecationReport() public function getDeprecationReport()
{ {
$this->authorize('reports.view');
$depreciations = Depreciation::get(); $depreciations = Depreciation::get();
// Grab all the assets // Grab all the assets
$assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'assetlog', 'company', 'model.category', 'model.depreciation') $assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'assetlog', 'company', 'model.category', 'model.depreciation')
@ -118,7 +118,7 @@ class ReportsController extends Controller
*/ */
public function exportDeprecationReport() public function exportDeprecationReport()
{ {
$this->authorize('reports.view');
// Grab all the assets // Grab all the assets
$assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog') $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog')
->orderBy('created_at', 'DESC')->get(); ->orderBy('created_at', 'DESC')->get();
@ -197,6 +197,7 @@ class ReportsController extends Controller
*/ */
public function audit() public function audit()
{ {
$this->authorize('reports.view');
return view('reports/audit'); return view('reports/audit');
} }
@ -210,7 +211,7 @@ class ReportsController extends Controller
*/ */
public function getActivityReport() public function getActivityReport()
{ {
$this->authorize('reports.view');
return view('reports/activity'); return view('reports/activity');
} }
@ -224,7 +225,7 @@ class ReportsController extends Controller
*/ */
public function getLicenseReport() public function getLicenseReport()
{ {
$this->authorize('reports.view');
$licenses = License::with('depreciation')->orderBy('created_at', 'DESC') $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
->with('company') ->with('company')
->get(); ->get();
@ -242,6 +243,7 @@ class ReportsController extends Controller
*/ */
public function exportLicenseReport() public function exportLicenseReport()
{ {
$this->authorize('reports.view');
$licenses = License::orderBy('created_at', 'DESC')->get(); $licenses = License::orderBy('created_at', 'DESC')->get();
$rows = [ ]; $rows = [ ];
@ -292,6 +294,7 @@ class ReportsController extends Controller
*/ */
public function getCustomReport() public function getCustomReport()
{ {
$this->authorize('reports.view');
$customfields = CustomField::get(); $customfields = CustomField::get();
return view('reports/custom')->with('customfields', $customfields); return view('reports/custom')->with('customfields', $customfields);
} }
@ -306,7 +309,7 @@ class ReportsController extends Controller
*/ */
public function postCustom(Request $request) public function postCustom(Request $request)
{ {
$this->authorize('reports.view');
\Debugbar::disable(); \Debugbar::disable();
$customfields = CustomField::get(); $customfields = CustomField::get();
$response = new StreamedResponse(function () use ($customfields, $request) { $response = new StreamedResponse(function () use ($customfields, $request) {
@ -721,6 +724,7 @@ class ReportsController extends Controller
*/ */
public function getAssetMaintenancesReport() public function getAssetMaintenancesReport()
{ {
$this->authorize('reports.view');
// Grab all the improvements // Grab all the improvements
$assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company') $assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
@ -739,6 +743,7 @@ class ReportsController extends Controller
*/ */
public function exportAssetMaintenancesReport() public function exportAssetMaintenancesReport()
{ {
$this->authorize('reports.view');
// Grab all the improvements // Grab all the improvements
$assetMaintenances = AssetMaintenance::with('asset', 'supplier') $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
@ -799,6 +804,7 @@ class ReportsController extends Controller
*/ */
public function getAssetAcceptanceReport() public function getAssetAcceptanceReport()
{ {
$this->authorize('reports.view');
$assetsForReport = Asset::notYetAccepted()->with('company')->get(); $assetsForReport = Asset::notYetAccepted()->with('company')->get();
return view('reports/unaccepted_assets', compact('assetsForReport')); return view('reports/unaccepted_assets', compact('assetsForReport'));
@ -813,7 +819,7 @@ class ReportsController extends Controller
*/ */
public function exportAssetAcceptanceReport() public function exportAssetAcceptanceReport()
{ {
$this->authorize('reports.view');
// Grab all the improvements // Grab all the improvements
$assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet()) $assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet())
->get(); ->get();
@ -862,6 +868,7 @@ class ReportsController extends Controller
*/ */
protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance) protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
{ {
$this->authorize('reports.view');
$assets = Asset::deployed() $assets = Asset::deployed()
->inModelList($modelsInCategoriesThatRequireAcceptance) ->inModelList($modelsInCategoriesThatRequireAcceptance)
->select('id') ->select('id')
@ -881,7 +888,7 @@ class ReportsController extends Controller
*/ */
protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance) protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance)
{ {
$this->authorize('reports.view');
return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance) return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
->select('id') ->select('id')
->get() ->get()
@ -897,7 +904,7 @@ class ReportsController extends Controller
*/ */
protected function getCategoriesThatRequireAcceptance() protected function getCategoriesThatRequireAcceptance()
{ {
$this->authorize('reports.view');
return array_pluck(Category::requiresAcceptance() return array_pluck(Category::requiresAcceptance()
->select('id') ->select('id')
->get() ->get()
@ -913,7 +920,7 @@ class ReportsController extends Controller
*/ */
protected function getAssetsCheckedOutRequiringAcceptance() protected function getAssetsCheckedOutRequiringAcceptance()
{ {
$this->authorize('reports.view');
return $this->getCheckedOutAssetsRequiringAcceptance( return $this->getCheckedOutAssetsRequiringAcceptance(
$this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance()) $this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance())
); );
@ -928,6 +935,7 @@ class ReportsController extends Controller
*/ */
protected function getAssetsNotAcceptedYet() protected function getAssetsNotAcceptedYet()
{ {
$this->authorize('reports.view');
return Asset::unaccepted(); return Asset::unaccepted();
} }
} }