lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Some fixes to some typos in other routes, commeting out parameters parameter which seems crashy

Browse source
This commit is contained in:
Brady Wetherington 2021-06-22 18:58:25 -07:00
parent 9456a03a88
commit 17aab61987
3 changed files with 71 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routes/api.php
View file

@ -980,14 +980,14 @@ Route::group(['prefix' => 'v1', 'middleware' => 'api'], function () {
] ]
)->name('api.kits.models.store'); )->name('api.kits.models.store');
Route::put('models/{model_id', Route::put('models/{model_id}',
[ [
Api\PredefinedKitsController::class, Api\PredefinedKitsController::class,
'updateModels' 'updateModels'
] ]
)->name('api.kits.models.update'); )->name('api.kits.models.update');
Route::delete('models/{model_id', Route::delete('models/{model_id}',
[ [
Api\PredefinedKitsController::class, Api\PredefinedKitsController::class,
'detachModels' 'detachModels'

165
routes/web/hardware.php
View file

@ -51,130 +51,97 @@ Route::group(
[Assets\AssetsController::class, 'dueForAudit'] [Assets\AssetsController::class, 'dueForAudit']
)->name('assets.audit.due'); )->name('assets.audit.due');
Route::get('audit/overdue', [ Route::get('audit/overdue',
'as' => 'assets.audit.overdue', [Assets\AssetsController::class, 'overdueForAudit']
'uses' => [Assets\AssetsController::class, 'overdueForAudit'], )->name('assets.audit.overdue');
]);
Route::get('audit/{id}', [ Route::get('audit/{id}',
'as' => 'asset.audit.create', [Assets\AssetsController::class, 'audit']
'uses' => [Assets\AssetsController::class, 'audit'], )->name('asset.audit.create');
]);
Route::post('audit/{id}', [ Route::post('audit/{id}',
'as' => 'asset.audit.store', [Assets\AssetsController::class, 'auditStore']
'uses' => [Assets\AssetsController::class, 'auditStore'], )->name('asset.audit.store');
]);
Route::get('history', [ Route::get('history',
'as' => 'asset.import-history', [Assets\AssetsController::class, 'getImportHistory']
'uses' => [Assets\AssetsController::class, 'getImportHistory'], )->name('asset.import-history');
]);
Route::post('history', [ Route::post('history',
'as' => 'asset.process-import-history', [Assets\AssetsController::class, 'postImportHistory']
'uses' => [Assets\AssetsController::class, 'postImportHistory'], )->name('asset.process-import-history');
]);
Route::get('bytag/{any?}', Route::get('bytag/{any?}',
[ [Assets\AssetsController::class, 'getAssetByTag']
'as' => 'findbytag/hardware', )->where('any', '.*')->name('findbytag/hardware');
'uses' => [Assets\AssetsController::class, 'getAssetByTag'],
]
)->where('any', '.*');
Route::get('byserial/{any?}', Route::get('byserial/{any?}',
[ [Assets\AssetsController::class, 'getAssetBySerial']
'as' => 'findbyserial/hardware', )->where('any', '.*')->name('findbyserial/hardware');
'uses' => [Assets\AssetsController::class, 'getAssetBySerial'],
]
)->where('any', '.*');
Route::get('{assetId}/clone', [ Route::get('{assetId}/clone',
'as' => 'clone/hardware', [Assets\AssetsController::class, 'getClone']
'uses' => [Assets\AssetsController::class, 'getClone'], )->name('clone/hardware');
]);
Route::get('{assetId}/label', [ Route::get('{assetId}/label',
'as' => 'label/hardware', [Assets\AssetsController::class, 'getLabel']
'uses' => [Assets\AssetsController::class, 'getLabel'], )->name('label/hardware');
]);
Route::post('{assetId}/clone', [Assets\AssetsController::class, 'postCreate']); Route::post('{assetId}/clone', [Assets\AssetsController::class, 'postCreate']);
Route::get('{assetId}/checkout', [ Route::get('{assetId}/checkout',
'as' => 'checkout/hardware', [Assets\AssetCheckoutController::class, 'create']
'uses' => [Assets\AssetCheckoutController::class, 'create'], )->name('checkout/hardware');
]); Route::post('{assetId}/checkout',
Route::post('{assetId}/checkout', [ [Assets\AssetCheckoutController::class, 'store']
'as' => 'checkout/hardware', )->name('checkout/hardware');
'uses' => [Assets\AssetCheckoutController::class, 'store'], Route::get('{assetId}/checkin/{backto?}',
]); [Assets\AssetCheckinController::class, 'create']
Route::get('{assetId}/checkin/{backto?}', [ )->name('checkin/hardware');
'as' => 'checkin/hardware',
'uses' => [Assets\AssetCheckinController::class, 'create'],
]);
Route::post('{assetId}/checkin/{backto?}', [ Route::post('{assetId}/checkin/{backto?}',
'as' => 'checkin/hardware', [Assets\AssetCheckinController::class, 'store']
'uses' => [Assets\AssetCheckinController::class, 'store'], )->name('checkin/hardware');
]); Route::get('{assetId}/view',
Route::get('{assetId}/view', [ [Assets\AssetsController::class, 'show']
'as' => 'hardware.view', )->name('hardware.view');
'uses' => [Assets\AssetsController::class, 'show'], Route::get('{assetId}/qr_code', [Assets\AssetsController::class, 'getQrCode'])->name('qr_code/hardware');
]); Route::get('{assetId}/barcode', [Assets\AssetsController::class, 'getBarCode'])->name('barcode/hardware');
Route::get('{assetId}/qr_code', ['as' => 'qr_code/hardware', 'uses' => [Assets\AssetsController::class, 'getQrCode']]); Route::get('{assetId}/restore',
Route::get('{assetId}/barcode', ['as' => 'barcode/hardware', 'uses' => [Assets\AssetsController::class, 'getBarCode']]); [Assets\AssetsController::class, 'getRestore']
Route::get('{assetId}/restore', [ )->name('restore/hardware');
'as' => 'restore/hardware', Route::post('{assetId}/upload',
'uses' => [Assets\AssetsController::class, 'getRestore'], [Assets\AssetFilesController::class, 'store']
]); )->name('upload/asset');
Route::post('{assetId}/upload', [
'as' => 'upload/asset',
'uses' => [Assets\AssetFilesController::class, 'store'],
]);
Route::get('{assetId}/showfile/{fileId}/{download?}', [ Route::get('{assetId}/showfile/{fileId}/{download?}',
'as' => 'show/assetfile', [Assets\AssetFilesController::class, 'show']
'uses' => [Assets\AssetFilesController::class, 'show'], )->name('show/assetfile');
]);
Route::delete('{assetId}/showfile/{fileId}/delete', [ Route::delete('{assetId}/showfile/{fileId}/delete',
'as' => 'delete/assetfile', [Assets\AssetFilesController::class, 'destroy']
'uses' => [Assets\AssetFilesController::class, 'destroy'], )->name('delete/assetfile');
]);
Route::post( Route::post(
'bulkedit', 'bulkedit',
[ [Assets\BulkAssetsController::class, 'edit']
'as' => 'hardware/bulkedit', )->name('hardware/bulkedit');
'uses' => [Assets\BulkAssetsController::class, 'edit'],
]
);
Route::post( Route::post(
'bulkdelete', 'bulkdelete',
[ [Assets\BulkAssetsController::class, 'destroy']
'as' => 'hardware/bulkdelete', )->name('hardware/bulkdelete');
'uses' => [Assets\BulkAssetsController::class, 'destroy'],
]
);
Route::post( Route::post(
'bulksave', 'bulksave',
[ [Assets\BulkAssetsController::class, 'update']
'as' => 'hardware/bulksave', )->name('hardware/bulksave');
'uses' => [Assets\BulkAssetsController::class, 'update'],
]
);
// Bulk checkout / checkin // Bulk checkout / checkin
Route::get('bulkcheckout', [ Route::get('bulkcheckout',
'as' => 'hardware/bulkcheckout', [Assets\BulkAssetsController::class, 'showCheckout']
'uses' => [Assets\BulkAssetsController::class, 'showCheckout'], )->name('hardware/bulkcheckout');
]); Route::post('bulkcheckout',
Route::post('bulkcheckout', [ [Assets\BulkAssetsController::class, 'storeCheckout']
'as' => 'hardware/bulkcheckout', )->name('hardware/bulkcheckout');
'uses' => [Assets\BulkAssetsController::class, 'storeCheckout'],
]);
}); });
Route::resource('hardware', Assets\AssetsController::class, [ Route::resource('hardware', Assets\AssetsController::class, [

6
routes/web/kits.php
View file

@ -35,7 +35,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
Route::put('models/{model_id}', Route::put('models/{model_id}',
[Kits\PredefinedKitsController::class, 'updateModel'] [Kits\PredefinedKitsController::class, 'updateModel']
)->parameters([2 => 'kit_id', 1 => 'model_id'])->name('kits.models.update'); )/* ->parameters([2 => 'kit_id', 1 => 'model_id'])*/->name('kits.models.update');
Route::get('models/{model_id}/edit', Route::get('models/{model_id}/edit',
[Kits\PredefinedKitsController::class, 'editModel'] [Kits\PredefinedKitsController::class, 'editModel']
@ -48,7 +48,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
// Consumables // Consumables
Route::put('consumables/{consumable_id}', Route::put('consumables/{consumable_id}',
[Kits\PredefinedKitsController::class, 'updateConsumable'] [Kits\PredefinedKitsController::class, 'updateConsumable']
)->parameters([2 => 'kit_id', 1 => 'consumable_id'])->name('kits.consumables.update'); )/*->parameters([2 => 'kit_id', 1 => 'consumable_id'])*/->name('kits.consumables.update');
Route::get('consumables/{consumable_id}/edit', Route::get('consumables/{consumable_id}/edit',
[Kits\PredefinedKitsController::class, 'editConsumable'] [Kits\PredefinedKitsController::class, 'editConsumable']
@ -61,7 +61,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
// Accessories // Accessories
Route::put('accessories/{accessory_id}', Route::put('accessories/{accessory_id}',
[Kits\PredefinedKitsController::class, 'updateAccessory'] [Kits\PredefinedKitsController::class, 'updateAccessory']
)->parameters([2 => 'kit_id', 1 => 'accessory_id'])->name('kits.accessories.update'); )/*->parameters([2 => 'kit_id', 1 => 'accessory_id'])*/->name('kits.accessories.update');
Route::get('accessories/{accessory_id}/edit', Route::get('accessories/{accessory_id}/edit',
[Kits\PredefinedKitsController::class, 'editAccessory'] [Kits\PredefinedKitsController::class, 'editAccessory']