diff --git a/src/Analytic/DateRangeAnalytic.php b/src/Analytic/DateRangeAnalytic.php index 344bcb3..bf5bb89 100644 --- a/src/Analytic/DateRangeAnalytic.php +++ b/src/Analytic/DateRangeAnalytic.php @@ -12,10 +12,11 @@ use App\Core\Analytic\DateRangeAnalytic as BaseDateRangeAnalytic; class DateRangeAnalytic extends BaseDateRangeAnalytic { protected string $page; + protected ?string $path; public function setPath(string $path): self { - $this->path = $path; + $this->path = rtrim($path, '-'); $this->reload = true; return $this; @@ -28,7 +29,7 @@ class DateRangeAnalytic extends BaseDateRangeAnalytic foreach ($entities as $key => $entity) { if ('view' === $type) { - if ($entity->getPath() === $this->path) { + if ($this->path === null || str_starts_with($entity->getPath(), $this->path)) { $newEntities[] = $entity; } } diff --git a/src/Controller/Blog/PostAdminController.php b/src/Controller/Blog/PostAdminController.php index 0ff5edd..d339870 100644 --- a/src/Controller/Blog/PostAdminController.php +++ b/src/Controller/Blog/PostAdminController.php @@ -254,7 +254,7 @@ class PostAdminController extends CrudController ->setDateRange(new \DateTime('now - '.$range), new \DateTime()) ->setPath($this->generateUrl('blog_menu_post', [ 'post' => $entity->getId(), - 'slug' => $entity->getSlug(), + 'slug' => '-', ])) ->setNode($node) ;