Merge branch 'calendar/finalization' into testing

This commit is contained in:
2022-11-28 21:38:35 +01:00
5 changed files with 12 additions and 139 deletions

View File

@@ -234,7 +234,7 @@ class CalendarController extends AbstractController
'paginator' => $paginator,
'filterOrder' => $filterOrder,
'nbIgnored' => $this->calendarACLAwareRepository->countIgnoredByAccompanyingPeriod($accompanyingPeriod, $from, $to),
'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
]);
}
@@ -268,7 +268,7 @@ class CalendarController extends AbstractController
'paginator' => $paginator,
'filterOrder' => $filterOrder,
'nbIgnored' => $this->calendarACLAwareRepository->countIgnoredByPerson($person, $from, $to),
'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
]);
}