mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
merge
This commit is contained in:
parent
6f29c0a7cf
commit
423b48279b
|
@ -543,19 +543,19 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
|
||||||
'restore'
|
'restore'
|
||||||
]
|
]
|
||||||
)->name('api.assets.restore');
|
)->name('api.assets.restore');
|
||||||
Route::post('{asset_id}/files',
|
Route::post('{asset_id}/files',
|
||||||
[
|
[
|
||||||
Api\AssetFilesController::class,
|
Api\AssetFilesController::class,
|
||||||
'store'
|
'store'
|
||||||
]
|
]
|
||||||
)->name('api.assets.files');
|
)->name('api.assets.files');
|
||||||
|
|
||||||
Route::get('{asset_id}/files',
|
Route::get('{asset_id}/files',
|
||||||
[
|
[
|
||||||
Api\AssetFilesController::class,
|
Api\AssetFilesController::class,
|
||||||
'list'
|
'list'
|
||||||
]
|
]
|
||||||
)->name('api.assets.files');
|
)->name('api.assets.files');
|
||||||
|
|
||||||
Route::get('{asset_id}/file/{file_id}',
|
Route::get('{asset_id}/file/{file_id}',
|
||||||
[
|
[
|
||||||
|
@ -578,7 +578,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
|
||||||
// the model name to be the parameter - and i think it's a good differentiation in the code while we convert the others.
|
// the model name to be the parameter - and i think it's a good differentiation in the code while we convert the others.
|
||||||
Route::patch('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.update');
|
Route::patch('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.update');
|
||||||
|
|
||||||
Route::resource('hardware',
|
Route::resource('hardware',
|
||||||
Api\AssetsController::class,
|
Api\AssetsController::class,
|
||||||
['names' => [
|
['names' => [
|
||||||
'index' => 'api.assets.index',
|
'index' => 'api.assets.index',
|
||||||
|
|
Loading…
Reference in a new issue