jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor system configuration title and wording (#2847)

Browse Source
This commit is contained in:
Kevin Papst
2021-10-13 13:37:44 +02:00
committed by GitHub
parent 6d7d441d42
commit 843cd8fb67
34 changed files with 48 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Controller/SystemConfigurationController.php
View File

@@ -449,11 +449,12 @@ final class SystemConfigurationController extends AbstractController
(new SystemConfigurationModel())
->setSection(SystemConfigurationModel::SECTION_FORM_INVOICE)
->setConfiguration([
// TODO that should be a custom type with validation
(new Configuration())
->setName('invoice.number_format')
->setLabel('invoice.number_format')
->setRequired(true)
->setType(TextType::class) // TODO that should be a custom type with validation
->setType(TextType::class)
->setTranslationDomain('system-configuration'),
(new Configuration())
->setName('invoice.simple_form')
@@ -470,15 +471,18 @@ final class SystemConfigurationController extends AbstractController
->setName('defaults.customer.timezone')
->setLabel('timezone')
->setType(TimezoneType::class)
->setValue(date_default_timezone_get()),
->setValue(date_default_timezone_get())
->setOptions(['help' => 'default_value_new']),
(new Configuration())
->setName('defaults.customer.country')
->setLabel('country')
->setType(CountryType::class),
->setType(CountryType::class)
->setOptions(['help' => 'default_value_new']),
(new Configuration())
->setName('defaults.customer.currency')
->setLabel('currency')
->setType(CurrencyType::class),
->setType(CurrencyType::class)
->setOptions(['help' => 'default_value_new']),
]),
(new SystemConfigurationModel())
->setSection(SystemConfigurationModel::SECTION_FORM_USER)
@@ -487,19 +491,28 @@ final class SystemConfigurationController extends AbstractController
->setName('defaults.user.timezone')
->setLabel('timezone')
->setType(TimezoneType::class)
->setValue(date_default_timezone_get()),
->setValue(date_default_timezone_get())
->setOptions(['help' => 'default_value_new']),
(new Configuration())
->setName('defaults.user.language')
->setLabel('language')
->setType(LanguageType::class),
->setType(LanguageType::class)
->setOptions(['help' => 'default_value_new']),
(new Configuration())
->setName('defaults.user.theme')
->setLabel('skin')
->setType(SkinType::class),
->setType(SkinType::class)
->setOptions(['help' => 'default_value_new']),
(new Configuration())
->setName('defaults.user.currency')
->setLabel('currency')
->setType(CurrencyType::class),
(new Configuration())
->setName('theme.avatar_url')
->setRequired(false)
->setLabel('theme.avatar_url')
->setType(CheckboxType::class)
->setTranslationDomain('system-configuration'),
]),
(new SystemConfigurationModel())
->setSection(SystemConfigurationModel::SECTION_THEME)
@@ -532,13 +545,6 @@ final class SystemConfigurationController extends AbstractController
->setOptions(['help' => 'help.theme.color_choices'])
->setConstraints([new ColorChoices()])
->setTranslationDomain('system-configuration'),
// allow avatar URLs
(new Configuration())
->setName('theme.avatar_url')
->setRequired(false)
->setLabel('theme.avatar_url')
->setType(CheckboxType::class)
->setTranslationDomain('system-configuration'),
// random colors as fallback
(new Configuration())
->setName('theme.random_colors')