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

Release 1.30 (#3651)

Browse Source 
* exclude all 403 and 404 from logs
* bump version
* cleanup tag handling
* prevent mandatory user preferences turning null
This commit is contained in:
Kevin Papst
2022-12-04 15:02:36 +01:00
committed by GitHub
parent 11dac19c8c
commit 58a9facc6d
14 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/HomepageController.php
View File

@@ -32,7 +32,7 @@ class HomepageController extends AbstractController
{
/** @var User $user */
$user = $this->getUser();
$userRoute = $user->getPreferenceValue('login.initial_view', InitialViewType::DEFAULT_VIEW);
$userRoute = $user->getPreferenceValue('login.initial_view', InitialViewType::DEFAULT_VIEW, false);
$userLanguage = $user->getLanguage();
$requestLanguage = $request->getLocale();

2
src/Controller/ProfileController.php
View File

@@ -262,7 +262,7 @@ final class ProfileController extends AbstractController
// switch locale ONLY if updated profile is the current user
$locale = $request->getLocale();
if ($this->getUser()->getId() === $profile->getId()) {
$locale = $profile->getPreferenceValue('language', $locale);
$locale = $profile->getPreferenceValue('language', $locale, false);
}
return $this->redirectToRoute('user_profile_preferences', [

4
src/Controller/ReportingController.php
View File

@@ -32,7 +32,7 @@ final class ReportingController extends AbstractController
$user = $this->getUser();
$route = null;
$defaultReport = $user->getPreferenceValue('reporting.initial_view', ReportingService::DEFAULT_VIEW);
$defaultReport = $user->getPreferenceValue('reporting.initial_view', ReportingService::DEFAULT_VIEW, false);
$allReports = $reportingService->getAvailableReports($user);
foreach ($allReports as $report) {
@@ -43,7 +43,7 @@ final class ReportingController extends AbstractController
}
// fallback, if the configured report could not be found
// eg. when it was deleted or replaced by an enhanced version with a new id
// e.g. when it was deleted or replaced by an enhanced version with a new id
if ($route === null && \count($allReports) > 0) {
$report = $allReports[array_keys($allReports)[0]];
$route = $report->getRoute();

2
src/Controller/TimesheetAbstractController.php
View File

@@ -535,7 +535,7 @@ abstract class TimesheetAbstractController extends AbstractController
protected function includeSummary(): bool
{
return (bool) $this->getUser()->getPreferenceValue('timesheet.daily_stats', false);
return (bool) $this->getUser()->getPreferenceValue('timesheet.daily_stats', false, false);
}
protected function includeUserInForms(string $formName): bool

2
src/Controller/TimesheetTeamController.php
View File

@@ -116,7 +116,7 @@ class TimesheetTeamController extends TimesheetAbstractController
$tags = [];
/** @var Tag $tag */
foreach ($entry->getTags() as $tag) {
$tag->removeTimesheet($entry);
$entry->addTag($tag);
$tags[] = $tag;
}