diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index c3ec0e549..df38c15d9 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -18,6 +18,7 @@ use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound; use Chill\MainBundle\Notification\NotificationHandlerManager; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\NotificationRepository; +use Chill\MainBundle\Security\Authorization\NotificationVoter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -169,6 +170,26 @@ class NotificationController extends AbstractController ]); } + /** + * @Route("/{id}/show", name="chill_main_notification_show") + */ + public function showAction(Notification $notification, Request $request): Response + { + $this->denyAccessUnlessGranted(NotificationVoter::SEE, $notification); + + $response = $this->render('@ChillMain/Notification/show.html.twig', [ + 'notification' => $notification, + 'handler' => $this->notificationHandlerManager->getHandler($notification), + ]); + + if ($this->getUser() instanceof User && !$notification->isReadBy($this->getUser())) { + $notification->markAsReadBy($this->getUser()); + $this->em->flush(); + } + + return $response; + } + private function countUnread(): array { return [ diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 4a1f504f4..96074e14d 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -12,9 +12,11 @@
  • {{ 'notification.Notifications received'|trans }} + {% if unreads['inbox'] > 0 %} {{ unreads['inbox'] }} + {% endif %}
  • @@ -39,19 +41,35 @@
    {% for data in datas %} {% set notification = data.notification %} -
    - {% include data.template with data.template_data %} -
    -
    - {% if step == 'inbox' %} -
    {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }}
    - {% endif %} -
    {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
    -
    {{ notification.date|format_datetime('long', 'short') }}
    -
    -
    - {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} -
    +
    +
    +
    + {% if step == 'inbox' %} + {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }} + {% endif %} + {% if not notification.isReadBy(app.user) %} +
    {{ 'notification.is_unread'|trans }}
    + {% endif %} +
    +
    {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
    +
    {{ notification.date|format_datetime('long', 'short') }}
    +
    +
    +
    +
    + {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} +
    +
    +
    +
    + {% include data.template with data.template_data %} +
    +
    +
      +
    • + +
      • +
    {% endfor %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig new file mode 100644 index 000000000..1fbe7693b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -0,0 +1,28 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block title 'notification.show notification from %sender%'|trans({ '%sender%': notification.sender|chill_entity_render_string }) %} + +{% block content %} +
    +
    +

    {{ 'notification.Notification'|trans }}

    + +
    + {% include handler.getTemplate(notification) with handler.getTemplateData(notification) %} +
    + +
    + {# à remplacer par un commentEmbeddable #} + {{ notification.message|chill_markdown_to_html }} +
    + + +
    +
    +{% endblock content %} diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php new file mode 100644 index 000000000..f0023ec12 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php @@ -0,0 +1,51 @@ +getUser(); + + if (!$user instanceof User) { + return false; + } + + switch ($attribute) { + case self::SEE: + return $subject->getSender() === $user || $subject->getAddressees()->contains($user); + + default: + throw new UnexpectedValueException("this subject {$subject} is not implemented"); + } + } +} diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml index 163b86d8e..30eed05c0 100644 --- a/src/Bundle/ChillMainBundle/config/services/security.yaml +++ b/src/Bundle/ChillMainBundle/config/services/security.yaml @@ -24,6 +24,8 @@ services: Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory: ~ + Chill\MainBundle\Security\Authorization\NotificationVoter: ~ + Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory' chill.main.security.authorization.helper: