Release 2.1.0 (#4321)
* fix deprecations * remove unused config * replace invalid annotation type with attribute * use AsDoctrineListener to fix deprecation * new ModifiedSubscriber to support custom logic and fix deprecation * removed inheritdoc comment * new ModifiedSubscriber to support custom logic and fix deprecation * cleanup event dispatcher interface * re-order annotation params * one more doctrine based deprecation * fix query to count active timesheets * link to "all times" to identify active timesheets * link icon instead of text * fix "skin" translation in wizard * use duration filter to show duration * added login link command and controller * bump tabler theme to 1.0 * added wizard to force password reset by user * allow to configure that new accounts need to reset their password * prevent uploading twig templates by default * bump composer packages * enable sandbox and basic security measures for custom twig templates for invoice and export * bump to symfony 6.3.5 * allow to export single user reports to excel * removed broken method to reload twig cache * added api parameter to fetch user collection fully serialized * allow to replace or append description via timesheet batch update * show api username above form
This commit is contained in:
@@ -11,6 +11,7 @@ namespace App\Form\MultiUpdate;
|
||||
|
||||
use App\Form\Type\ActivityType;
|
||||
use App\Form\Type\CustomerType;
|
||||
use App\Form\Type\DescriptionType;
|
||||
use App\Form\Type\FixedRateType;
|
||||
use App\Form\Type\HourlyRateType;
|
||||
use App\Form\Type\MetaFieldsCollectionType;
|
||||
@@ -141,9 +142,12 @@ final class TimesheetMultiUpdate extends AbstractType
|
||||
'label' => false,
|
||||
'required' => true,
|
||||
'expanded' => true,
|
||||
'label_attr' => [
|
||||
'class' => 'radio-inline',
|
||||
],
|
||||
'choices' => [
|
||||
'replaceTags' => true,
|
||||
'appendTags' => false,
|
||||
'append' => false,
|
||||
'replace' => true,
|
||||
]
|
||||
]);
|
||||
|
||||
@@ -151,6 +155,23 @@ final class TimesheetMultiUpdate extends AbstractType
|
||||
'required' => false,
|
||||
]);
|
||||
|
||||
$builder->add('replaceDescription', ChoiceType::class, [
|
||||
'label' => false,
|
||||
'required' => true,
|
||||
'expanded' => true,
|
||||
'label_attr' => [
|
||||
'class' => 'radio-inline',
|
||||
],
|
||||
'choices' => [
|
||||
'append' => false,
|
||||
'replace' => true,
|
||||
]
|
||||
]);
|
||||
|
||||
$builder->add('description', DescriptionType::class, [
|
||||
'required' => false,
|
||||
]);
|
||||
|
||||
if ($options['include_user']) {
|
||||
$builder->add('user', UserType::class, [
|
||||
'required' => false,
|
||||
|
||||
Reference in New Issue
Block a user