Skip to content

A free open source IT asset/license management system

imported labels persist when refreshed until saved

Godfrey M3d9482fc239e
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php
index 39b0f8fd36..c96fa435fe 100755
--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -394,6 +394,8 @@ class LabelsController extends Controller
'is_default' => false,
]);
+ session()->forget('imported_label_config');
+
return redirect()->route('settings.labels.index')
->with('success', trans('admin/labels/general.created_successfully', ['item' => $customLabel->name]));
}
@@ -597,11 +599,7 @@ class LabelsController extends Controller
$selectedLabel = str_replace('/', '\\', $selectedLabel);
}
- $importedConfig = session('imported_label_config');
-
- if ($importedConfig) {
- $selectedLabel = data_get($importedConfig, 'template', $selectedLabel);
- }
+ $importedConfig = $request->boolean('import') ? session('imported_label_config') : null;
try {
$template = match (true) {
@@ -619,7 +617,13 @@ class LabelsController extends Controller
}
$label = $this->previewLabelForTemplate($template);
- $config = $importedConfig ?: $label->toEditorConfig();
+
+ if ($importedConfig) {
+ $label->applyEditorConfig($importedConfig);
+ $config = $importedConfig;
+ } else {
+ $config = $label->toEditorConfig();
+ }
$type = data_get($config, 'type');
diff --git a/app/Livewire/Labels/ImportLabel.php b/app/Livewire/Labels/ImportLabel.php
index 48896a2eaa..f4d648b339 100644
--- a/app/Livewire/Labels/ImportLabel.php
+++ b/app/Livewire/Labels/ImportLabel.php
@@ -73,10 +73,11 @@ class ImportLabel extends Component
return;
}
- session()->flash('imported_label_config', $config);
+ session()->put('imported_label_config', $config);
$this->redirectRoute('settings.labels.create', [
'label' => $config['template'] ?? null,
+ 'import' => 1,
]);
}