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

@@ -142,8 +142,12 @@ class BaseQuery
return $this->orderBy;
}
public function setOrderBy(string $orderBy): self
public function setOrderBy(?string $orderBy): self
{
if ($orderBy === null) {
$orderBy = (string) $this->defaults['orderBy']; // @phpstan-ignore-line
}
$this->orderBy = $orderBy;
return $this;
@@ -154,8 +158,12 @@ class BaseQuery
return $this->order;
}
public function setOrder(string $order): self
public function setOrder(?string $order): self
{
if ($order === null) {
$order = (string) $this->defaults['order']; // @phpstan-ignore-line
}
if (\in_array($order, [self::ORDER_ASC, self::ORDER_DESC])) {
$this->order = $order;
}