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

added avatars, show user teams in list, new team dashboard widgets (#1150)

Browse Source
This commit is contained in:
Kevin Papst
2019-10-03 13:44:16 +02:00
committed by GitHub
parent 718ad4b398
commit e8c25d8ac5
120 changed files with 2585 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Form/Extension/EnhancedChoiceTypeExtension.php
View File

@@ -54,6 +54,12 @@ class EnhancedChoiceTypeExtension extends AbstractTypeExtension
return;
}
// expanded selects are rendered as checkboxes and using the selectpicker
// would display an empty dropdown
if (isset($options['expanded']) && true === $options['expanded']) {
return;
}
if (!isset($view->vars['attr'])) {
$view->vars['attr'] = [];
}

4
src/Form/TimesheetEditForm.php
View File

@@ -219,10 +219,10 @@ class TimesheetEditForm extends AbstractType
/** @var Project $project */
$project = $repo->find($project);
if (null !== $project) {
if (!$project->getCustomer()->getVisible()) {
if (!$project->getCustomer()->isVisible()) {
$customer = null;
$project = null;
} elseif (!$project->getVisible()) {
} elseif (!$project->isVisible()) {
$project = null;
}
}