A free open source IT asset/license management system
Merge branch 'develop' into Label_customization
Godfrey Md7a07b96e84a
diff --cc app/View/Label.phpindex eb48b47b6b,65b3f078cc..d6dd360182--- a/app/View/Label.php+++ b/app/View/Label.php@@@ -49,11 -44,9 +44,10 @@@ class Label implements Vie$settings = $this->data->get('settings');$assets = $this->data->get('assets');$offset = $this->data->get('offset');+ $template = $this->data->get('template');-// If disabled, pass to legacy view- if ((!$settings->label2_enable)) {+ if ((! $settings->label2_enable)) {return view('hardware/labels')->with('assets', $assets)->with('settings', $settings)diff --cc routes/web.phpindex c751976d0c,2709f422aa..ecdce98b0d--- a/routes/web.php+++ b/routes/web.php@@@ -207,22 -205,15 +200,20 @@@ Route::group(['prefix' => 'admin', 'midRoute::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index')- ->breadcrumbs(fn (Trail $trail) =>- $trail->parent('settings.index')+ ->breadcrumbs(fn (Trail $trail) => $trail->parent('settings.index')->push(trans('admin/settings/general.labels_title'), route('settings.labels.index')));+ Route::get('labels/customizer-preview/{labelName}', [LabelsController::class, 'customLabelPreview']+ )->where('labelName', '.*')->name('labels.customizer-preview');Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save');+ Route::get('/settings/labels/edit', [LabelsController::class, 'edit'])+ ->name('settings.labels.edit');+Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index')- ->breadcrumbs(fn (Trail $trail) =>- $trail->parent('settings.index')+ ->breadcrumbs(fn (Trail $trail) => $trail->parent('settings.index')->push(trans('admin/settings/general.ldap_ad'), route('settings.ldap.index')));Route::post('ldap', [SettingsController::class, 'postLdapSettings'])