gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into livewire4

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
Marcus Moore
2026-02-25 13:29:07 -08:00
parent 7ada7fb327 378d9e008e
commit 4babaa85fc
1087 changed files with 22754 additions and 9666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
routes/web/components.php
View File

@@ -25,6 +25,11 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () {
[Components\ComponentCheckinController::class, 'store']
)->name('components.checkin.store');
Route::get('{component}/clone',
[Components\ComponentsController::class, 'getClone']
)->name('components.clone.create');
});

11
routes/web/fields.php
View File

@@ -32,18 +32,25 @@ Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
[CustomFieldsetsController::class, 'associate']
)->name('fieldsets.associate');
Route::resource('fieldsets', CustomFieldsetsController::class, [
'parameters' => [
'fieldset' => 'fieldset',
'field' => 'field_id'
]
],
'except' => ['show', 'view']
]);
Route::get(
'fieldsets/{fieldset}/edit',
[CustomFieldsetsController::class, 'show']
)->name('fieldsets.show');
});
Route::resource('fields', CustomFieldsController::class,
['middleware' => ['auth'],
'except' => ['show']
'except' => ['show', 'view']
]);