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

Release 2.0.16 (#3990)

Browse Source 
https://github.com/kimai/kimai/pull/3990
This commit is contained in:
Kevin Papst
2023-04-27 18:48:31 +02:00
committed by GitHub
parent 844062b90e
commit 01e26dca9e
28 changed files with 198 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entity/Timesheet.php
View File

@@ -184,7 +184,8 @@ class Timesheet implements EntityWithMetaFields, ExportableItem
/**
* Internal property used to determine whether the billable field should be calculated automatically.
*/
private string $billableMode = self::BILLABLE_DEFAULT;
#[Assert\NotNull]
private ?string $billableMode = self::BILLABLE_DEFAULT;
#[ORM\Column(name: 'category', type: 'string', length: 10, nullable: false, options: ['default' => 'work'])]
#[Assert\NotNull]
private ?string $category = self::WORK;
@@ -552,12 +553,12 @@ class Timesheet implements EntityWithMetaFields, ExportableItem
return $this;
}
public function getBillableMode(): string
public function getBillableMode(): ?string
{
return $this->billableMode;
}
public function setBillableMode(string $billableMode): void
public function setBillableMode(?string $billableMode): void
{
$this->billableMode = $billableMode;
}

1
src/Entity/User.php
View File

@@ -158,6 +158,7 @@ class User implements UserInterface, EquatableInterface, ThemeUserInterface, Pas
private ?bool $isAllowedToSeeAllData = null;
#[ORM\Column(name: 'username', type: 'string', length: 180, nullable: false)]
#[Assert\NotBlank(groups: ['Registration', 'UserCreate', 'Profile'])]
#[Assert\Regex(pattern: '/\//', match: false, groups: ['Registration', 'UserCreate', 'Profile'])]
#[Assert\Length(min: 2, max: 60, groups: ['Registration', 'UserCreate', 'Profile'])]
#[Serializer\Expose]
#[Serializer\Groups(['Default'])]