Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Inject current template name in templates

Browse source 
Use either legacy key _PAGE_ or new 'template' one.

Related to https://github.com/kalvn/Shaarli-Material/issues/118
This commit is contained in:
ArthurHoaro 2021-01-19 10:34:11 +01:00
parent 544bbdaf83
commit ccd1862d5f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/front/controller/visitor/ShaarliVisitorController.php
View file

@ -56,6 +56,10 @@ protected function assignAllView(array $data): self
protected function render(string $template): string protected function render(string $template): string
{ {
// Legacy key that used to be injected by PluginManager
$this->assignView('_PAGE_', $template);
$this->assignView('template', $template);
$this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL)); $this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL));
$this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE)); $this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));

3
tests/front/controller/visitor/ShaarliVisitorControllerTest.php
View file

@ -93,6 +93,9 @@ public function testRender(): void
static::assertSame('templateName', $render); static::assertSame('templateName', $render);
static::assertSame('templateName', $this->assignedValues['_PAGE_']);
static::assertSame('templateName', $this->assignedValues['template']);
static::assertSame(10, $this->assignedValues['linkcount']); static::assertSame(10, $this->assignedValues['linkcount']);
static::assertSame(5, $this->assignedValues['privateLinkcount']); static::assertSame(5, $this->assignedValues['privateLinkcount']);
static::assertSame(['error'], $this->assignedValues['plugin_errors']); static::assertSame(['error'], $this->assignedValues['plugin_errors']);