improved duration and minute selector (#2264)
* do not close modal if form is dirty * deprecated TimesheetConfiguration * inject timezone in form types * cleanup usage of UserDateTimeFactory * allow to configure increment steps for minutes * use 15 minutes step for datetimepicker in project edit form * use rounding rules for increments in minute select for begin and end * allow duration in multi user and admin timesheet forms * make dropdown values configurable
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
|
||||
namespace App\Twig;
|
||||
|
||||
use App\Configuration\TimesheetConfiguration;
|
||||
use App\Configuration\SystemConfiguration;
|
||||
use App\Utils\Markdown;
|
||||
use Twig\Extension\AbstractExtension;
|
||||
use Twig\TwigFilter;
|
||||
@@ -24,14 +24,14 @@ final class MarkdownExtension extends AbstractExtension
|
||||
*/
|
||||
private $markdown;
|
||||
/**
|
||||
* @var TimesheetConfiguration
|
||||
* @var SystemConfiguration
|
||||
*/
|
||||
private $configuration;
|
||||
|
||||
/**
|
||||
* @param Markdown $parser
|
||||
*/
|
||||
public function __construct(Markdown $parser, TimesheetConfiguration $configuration)
|
||||
public function __construct(Markdown $parser, SystemConfiguration $configuration)
|
||||
{
|
||||
$this->markdown = $parser;
|
||||
$this->configuration = $configuration;
|
||||
@@ -66,7 +66,7 @@ final class MarkdownExtension extends AbstractExtension
|
||||
$content = trim(substr($content, 0, 100)) . ' …';
|
||||
}
|
||||
|
||||
if ($this->configuration->isMarkdownEnabled()) {
|
||||
if ($this->configuration->isTimesheetMarkdownEnabled()) {
|
||||
$content = $this->markdown->toHtml($content, false);
|
||||
} elseif ($fullLength) {
|
||||
$content = '<p>' . nl2br($content) . '</p>';
|
||||
@@ -87,7 +87,7 @@ final class MarkdownExtension extends AbstractExtension
|
||||
return '';
|
||||
}
|
||||
|
||||
if ($this->configuration->isMarkdownEnabled()) {
|
||||
if ($this->configuration->isTimesheetMarkdownEnabled()) {
|
||||
return $this->markdown->toHtml($content, false);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user