kalugin66/kimai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 1.30.3 (#3763)

Browse Source 
* fix calendar title for project - customer
* allow to pre-fill timesheet metafields via URL
This commit is contained in:
Kevin Papst
2023-01-15 17:51:07 +01:00
committed by GitHub
parent d74236d9ac
commit 559868fede
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/**
* The current release version
*/
public const VERSION = '1.30.2';
public const VERSION = '1.30.3';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 13002;
public const VERSION_ID = 13003;
/**
* The current release status, either "stable" or "dev"
*/

3
src/Controller/TimesheetAbstractController.php
View File

@@ -148,14 +148,13 @@ abstract class TimesheetAbstractController extends AbstractController
protected function create(Request $request, string $renderTemplate): Response
{
$entry = $this->service->createNewTimesheet($this->getUser());
$entry = $this->service->createNewTimesheet($this->getUser(), $request);
$preForm = $this->createFormForGetRequest(TimesheetPreCreateForm::class, $entry, [
'include_user' => $this->includeUserInForms('create'),
]);
$preForm->submit($request->query->all(), false);
$this->service->prepareNewTimesheet($entry, $request);
$createForm = $this->getCreateForm($entry);
$createForm->handleRequest($request);

2
src/Form/TimesheetPreCreateForm.php
View File

@@ -10,6 +10,7 @@
namespace App\Form;
use App\Form\Type\DescriptionType;
use App\Form\Type\MetaFieldsCollectionType;
use App\Form\Type\TagsInputType;
use App\Form\Type\UserType;
use Symfony\Component\Form\AbstractType;
@@ -29,6 +30,7 @@ class TimesheetPreCreateForm extends AbstractType
$this->addActivity($builder, null, null, ['required' => false]);
$builder->add('description', DescriptionType::class, ['required' => false]);
$builder->add('tags', TagsInputType::class, ['required' => false]);
$builder->add('metaFields', MetaFieldsCollectionType::class);
if ($options['include_user']) {
$builder->add('user', UserType::class, ['required' => false]);
}

2
templates/calendar/user.html.twig
View File

@@ -149,7 +149,7 @@
{% elseif config.entryTitlePattern == constant('\\App\\Form\\Type\\CalendarTitlePatternType::PATTERN_CUSTOMER_DESCRIPTION') %}
title = apiItem.project.customer.name + description;
{% elseif config.entryTitlePattern == constant('\\App\\Form\\Type\\CalendarTitlePatternType::PATTERN_PROJECT_CUSTOMER') %}
title = apiItem.project.name + apiItem.project.customer.name;
title = apiItem.project.name + '{{ constant('\\App\\Form\\Type\\CalendarTitlePatternType::SPACER') }}' + apiItem.project.customer.name;
{% endif %}
if (title === '' || title === null) {