Release 2.45 (#5721)

Co-authored-by: Henning Klein <info@henningklein.de>

src/Form/TimesheetEditForm.php

@@ -105,6 +105,10 @@ class TimesheetEditForm extends AbstractType
             $this->addDuration($builder, $options, (!$options['allow_begin_datetime'] || !$options['allow_end_datetime']), $isNew);
         }
 
+        if ($this->systemConfiguration->isBreakTimeEnabled()) {
+            $builder->add('break', DurationType::class, ['label' => 'break', 'required' => false, 'icon' => 'break']);
+        }
+
         // -----------------------------------------------------
         $query = new CustomerFormTypeQuery($customer);
         $query->setUser($options['user']); // @phpstan-ignore-line
@@ -328,10 +332,6 @@ class TimesheetEditForm extends AbstractType
 
         $builder->add('duration', DurationType::class, $durationOptions);
 
-        if ($this->systemConfiguration->isBreakTimeEnabled()) {
-            $builder->add('break', DurationType::class, ['label' => 'break', 'required' => false, 'icon' => 'break']);
-        }
-
         $builder->addEventListener(
             FormEvents::POST_SET_DATA,
             function (FormEvent $event): void {

src/Form/Toolbar/CalendarToolbarForm.php

@@ -25,10 +25,12 @@ final class CalendarToolbarForm extends AbstractType
             'view_timezone' => $options['timezone'],
         ]);
         $builder->add('view', CalendarViewType::class, []);
-        $builder->add('user', UserType::class, [
-            'required' => false,
-            'attr' => ['onchange' => 'this.form.submit()']
-        ]);
+        if ($options['change_user']) {
+            $builder->add('user', UserType::class, [
+                'required' => false,
+                'attr' => ['onchange' => 'this.form.submit()']
+            ]);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver): void

src/Form/Type/TagsType.php

@@ -39,7 +39,7 @@ final class TagsType extends AbstractType
     public function getParent(): string
     {
         if ($this->count === null) {
-            $this->count = $this->repository->count([]);
+            $this->count = $this->repository->count(['visible' => true]);
         }
 
         if ($this->count > self::MAX_AMOUNT_SELECT) {