Release 2.6.0 (#4472)

- Added: calendar entry title combination for customer, project and activity
- Added: show not_invoiced and not_exported data in detail screens
- Added: force logout if user is disabled
- Added: reduced amount of database queries on several screens
- Fixed: open-close status on work-contract screen for users without configuration
- Fixed: failsafe order/orderBy in query if manually manipulated to be null
- Fixed: unify statistic calculation (not_invoiced and not_exported) across screens
- Tech: bump packages
- Tech: Symfony 6.4
This commit is contained in:
Kevin Papst
2023-12-17 16:19:50 +01:00
committed by GitHub
parent af82fd040d
commit 5f4b6d3cfa
77 changed files with 1362 additions and 1242 deletions

View File

@@ -62,7 +62,7 @@ final class RecentActivitiesSource implements DragAndDropSource
return $this->entries;
}
public function getBlockInclude(): ?string
public function getBlockInclude(): string
{
return 'calendar/drag-drop.html.twig';
}

View File

@@ -44,12 +44,14 @@ final class TimesheetEntry implements DragAndDropEntry
public function getTitle(): string
{
if ($this->timesheet->getActivity() !== null && $this->timesheet->getActivity()->getName() !== null) {
return $this->timesheet->getActivity()->getName();
$activity = $this->timesheet->getActivity();
if ($activity !== null && $activity->getName() !== null) {
return $activity->getName();
}
if (null !== $this->timesheet->getProject() && $this->timesheet->getProject()->getName() !== null) {
return $this->timesheet->getProject()->getName();
$project = $this->timesheet->getProject();
if ($project !== null && $project->getName() !== null) {
return $project->getName();
}
return $this->timesheet->getDescription() ?? '';
@@ -60,7 +62,7 @@ final class TimesheetEntry implements DragAndDropEntry
return $this->color;
}
public function getBlockName(): ?string
public function getBlockName(): string
{
return 'dd_timesheet';
}