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

Release 2.0.25 (#4066)

Browse Source 
* added support for hourly rate column in detail table
* allow to register icon in extension
* allow to show QR code secret
* new translations
* bump theme and packages
* fix validation for invoice-document-filenames with uppercase character
* max upload size 1MB
* fix last month in daterange-picker in certain situations, more years in quick-select
* remove unused package-versions-deprecated
* link preferences from contract warning message
* added page_setup page layout
* prevent DROP TABLE in addSQL() and replace drop table with schema call
* added azuyalabs/yasumi
This commit is contained in:
Kevin Papst
2023-06-06 23:05:20 +02:00
committed by GitHub
parent 2ba9cff281
commit 0663995d06
34 changed files with 629 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/ContractController.php
View File

@@ -64,8 +64,10 @@ final class ContractController extends AbstractController
$yearDate = $values->getDate();
$year = $workingTimeService->getYear($profile, $yearDate);
$page = new PageSetup('status');
$page = new PageSetup('work_times');
$page->setHelp('contract.html');
$page->setActionName('contract');
$page->setPaginationForm($form);
// additional boxes by plugins
$controllerEvent = new WorkContractDetailControllerEvent($year);

32
src/Controller/DoctorController.php
View File

@@ -120,27 +120,25 @@ final class DoctorController extends AbstractController
/** @var array<string, string> $versions */
$versions = [];
if (class_exists(InstalledVersions::class)) {
$rootPackage = InstalledVersions::getRootPackage()['name'];
foreach (InstalledVersions::getInstalledPackages() as $package) {
$versions[$package] = InstalledVersions::getPrettyVersion($package);
$rootPackage = InstalledVersions::getRootPackage()['name'];
foreach (InstalledVersions::getInstalledPackages() as $package) {
$versions[$package] = InstalledVersions::getPrettyVersion($package);
}
// remove kimai from the package list
$versions = array_filter($versions, function ($version, $name) use ($rootPackage): bool {
if ($name === $rootPackage) {
return false;
}
// remove kimai from the package list
$versions = array_filter($versions, function ($version, $name) use ($rootPackage): bool {
if ($name === $rootPackage) {
return false;
}
if ($version === null || $version === '*') {
return false;
}
if ($version === null || $version === '*') {
return false;
}
return true;
}, ARRAY_FILTER_USE_BOTH);
return true;
}, ARRAY_FILTER_USE_BOTH);
ksort($versions);
}
ksort($versions);
return $versions;
}

1
src/Controller/ProfileController.php
View File

@@ -413,6 +413,7 @@ final class ProfileController extends AbstractController
'form' => $form->createView(),
'deactivate' => $this->getTwoFactorDeactivationForm($profile)->createView(),
'qr_code' => $result,
'secret' => $profile->getTotpSecret(),
]);
}