groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-13 21:59:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge tag 'v2.2.1' into Buerklin-provider

Browse source
This commit is contained in:
Marc Kreidler 2025-12-06 15:10:53 +01:00
commit 7de735eb1e
191 changed files with 27939 additions and 2310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Settings/AppSettings.php
View file

@ -26,7 +26,7 @@ namespace App\Settings;
use App\Settings\BehaviorSettings\BehaviorSettings;
use App\Settings\InfoProviderSystem\InfoProviderSettings;
use App\Settings\MiscSettings\MiscSettings;
use App\Settings\SystemSettings\AttachmentsSettings;
use App\Settings\SystemSettings\SystemSettings;
use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
use Jbtronics\SettingsBundle\Settings\Settings;
use Jbtronics\SettingsBundle\Settings\SettingsTrait;
@ -49,4 +49,4 @@ class AppSettings
#[EmbeddedSettings()]
public ?MiscSettings $miscSettings = null;
}
}

5
src/Settings/BehaviorSettings/BehaviorSettings.php
View file

@ -26,8 +26,9 @@ namespace App\Settings\BehaviorSettings;
use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
use Jbtronics\SettingsBundle\Settings\Settings;
use Jbtronics\SettingsBundle\Settings\SettingsTrait;
use Symfony\Component\Translation\TranslatableMessage as TM;
#[Settings]
#[Settings(label: new TM("settings.behavior"))]
class BehaviorSettings
{
use SettingsTrait;
@ -40,4 +41,4 @@ class BehaviorSettings
#[EmbeddedSettings]
public ?PartInfoSettings $partInfo = null;
}
}

9
src/Settings/BehaviorSettings/SidebarSettings.php
View file

@ -73,4 +73,11 @@ class SidebarSettings
*/
#[SettingsParameter(label: new TM("settings.behavior.sidebar.rootNodeRedirectsToNewEntity"))]
public bool $rootNodeRedirectsToNewEntity = false;
}
/**
* @var bool Whether to include child nodes in the data structure nodes table, or only show the selected node's parts.
*/
#[SettingsParameter(label: new TM("settings.behavior.sidebar.data_structure_nodes_table_include_children"),
description: new TM("settings.behavior.sidebar.data_structure_nodes_table_include_children.help"))]
public bool $dataStructureNodesTableIncludeChildren = true;
}

3
src/Settings/InfoProviderSystem/InfoProviderSettings.php
View file

@ -27,8 +27,9 @@ use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
use Jbtronics\SettingsBundle\Settings\Settings;
use Jbtronics\SettingsBundle\Settings\SettingsParameter;
use Jbtronics\SettingsBundle\Settings\SettingsTrait;
use Symfony\Component\Translation\TranslatableMessage as TM;
#[Settings()]
#[Settings(label: new TM("settings.ips"))]
class InfoProviderSettings
{
use SettingsTrait;

5
src/Settings/MiscSettings/MiscSettings.php
View file

@ -25,8 +25,9 @@ namespace App\Settings\MiscSettings;
use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
use Jbtronics\SettingsBundle\Settings\Settings;
use Symfony\Component\Translation\TranslatableMessage as TM;
#[Settings]
#[Settings(label: new TM("settings.misc"))]
class MiscSettings
{
#[EmbeddedSettings]
@ -34,4 +35,4 @@ class MiscSettings
#[EmbeddedSettings]
public ?ExchangeRateSettings $exchangeRate = null;
}
}

15
src/Settings/SystemSettings/LocalizationSettings.php
View file

@ -23,9 +23,12 @@ declare(strict_types=1);
namespace App\Settings\SystemSettings;
use App\Form\Type\LanguageMenuEntriesType;
use App\Form\Type\LocaleSelectType;
use App\Settings\SettingsIcon;
use Jbtronics\SettingsBundle\Metadata\EnvVarMode;
use Jbtronics\SettingsBundle\ParameterTypes\ArrayType;
use Jbtronics\SettingsBundle\ParameterTypes\StringType;
use Jbtronics\SettingsBundle\Settings\Settings;
use Jbtronics\SettingsBundle\Settings\SettingsParameter;
use Jbtronics\SettingsBundle\Settings\SettingsTrait;
@ -60,4 +63,14 @@ class LocalizationSettings
envVar: "string:BASE_CURRENCY", envVarMode: EnvVarMode::OVERWRITE
)]
public string $baseCurrency = 'EUR';
}
#[SettingsParameter(type: ArrayType::class,
label: new TM("settings.system.localization.language_menu_entries"),
description: new TM("settings.system.localization.language_menu_entries.description"),
options: ['type' => StringType::class],
formType: LanguageMenuEntriesType::class,
formOptions: ['multiple' => true, 'required' => false, 'ordered' => true],
)]
#[Assert\All([new Assert\Locale()])]
public array $languageMenuEntries = [];
}

12
src/Settings/SystemSettings.php → src/Settings/SystemSettings/SystemSettings.php
View file

@ -21,17 +21,13 @@
declare(strict_types=1);
namespace App\Settings;
namespace App\Settings\SystemSettings;
use App\Settings\SystemSettings\AttachmentsSettings;
use App\Settings\SystemSettings\CustomizationSettings;
use App\Settings\SystemSettings\HistorySettings;
use App\Settings\SystemSettings\LocalizationSettings;
use App\Settings\SystemSettings\PrivacySettings;
use Jbtronics\SettingsBundle\Settings\EmbeddedSettings;
use Jbtronics\SettingsBundle\Settings\Settings;
use Symfony\Component\Translation\TranslatableMessage as TM;
#[Settings]
#[Settings(label: new TM("settings.system"))]
class SystemSettings
{
#[EmbeddedSettings()]
@ -48,4 +44,4 @@ class SystemSettings
#[EmbeddedSettings()]
public ?HistorySettings $history = null;
}
}