added database driven system configurations with admin screen (#647)

This commit is contained in:
Kevin Papst
2019-03-22 20:58:38 +01:00
committed by GitHub
parent e990ae4800
commit 13d9f8f3f7
142 changed files with 2262 additions and 64727 deletions

View File

@@ -9,6 +9,7 @@
namespace App\Twig;
use App\Configuration\TimesheetConfiguration;
use App\Utils\Markdown;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
@@ -23,18 +24,18 @@ class MarkdownExtension extends AbstractExtension
*/
private $markdown;
/**
* @var bool
* @var TimesheetConfiguration
*/
private $timesheetIsMarkdown = false;
protected $configuration;
/**
* MarkdownExtension constructor.
* @param Markdown $parser
*/
public function __construct(Markdown $parser, bool $timesheetAsMarkdown = false)
public function __construct(Markdown $parser, TimesheetConfiguration $configuration)
{
$this->markdown = $parser;
$this->timesheetIsMarkdown = $timesheetAsMarkdown;
$this->configuration = $configuration;
}
/**
@@ -60,7 +61,7 @@ class MarkdownExtension extends AbstractExtension
return '';
}
if ($this->timesheetIsMarkdown) {
if ($this->configuration->isMarkdownEnabled()) {
return $this->markdown->toHtml($content, false);
}