DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 16:14:18 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-09-29 19:00:27 +01:00
parent 352e53a036 758d808772
commit c45ede2d17
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/consumables/view.blade.php
View file

@ -74,7 +74,7 @@
data-sort-name="name" data-sort-name="name"
id="consumablesCheckedoutTable" id="consumablesCheckedoutTable"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-url="{{route('api.consumables.showUsers', $consumable->id)}}" data-url="{{route('api.consumables.show.users', $consumable->id)}}"
data-export-options='{ data-export-options='{
"fileName": "export-consumables-{{ str_slug($consumable->name) }}-checkedout-{{ date('Y-m-d') }}", "fileName": "export-consumables-{{ str_slug($consumable->name) }}-checkedout-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

10
routes/api.php
View file

@ -280,17 +280,9 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
Api\ConsumablesController::class, Api\ConsumablesController::class,
'getDataView' 'getDataView'
] ]
)->name('api.consumables.showUsers'); )->name('api.consumables.show.users');
// This is LEGACY endpoint URL and should be removed in the next major release
Route::get('view/{id}/users',
[
Api\ConsumablesController::class,
'getDataView'
]
)->name('api.consumables.showUsers');
Route::post('{consumable}/checkout', Route::post('{consumable}/checkout',
[ [
Api\ConsumablesController::class, Api\ConsumablesController::class,