Skip to content
Snippets Groups Projects
Commit 436dddcc authored by Camille Simiand's avatar Camille Simiand
Browse files

Improve email message for editor

parent 7a7350f5
No related branches found
No related tags found
1 merge request!45tuleap-81-allow-a-new-user-to-access-the-capsule-edition-mode
Pipeline #747 passed
...@@ -11,6 +11,7 @@ use App\Repository\CapsulePendingEditorRepository; ...@@ -11,6 +11,7 @@ use App\Repository\CapsulePendingEditorRepository;
use App\Repository\CapsuleRepository; use App\Repository\CapsuleRepository;
use App\Repository\UserRepository; use App\Repository\UserRepository;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use http\Env;
use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Bridge\Twig\Mime\TemplatedEmail;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
...@@ -188,7 +189,8 @@ class CapsuleEditorController extends AbstractController ...@@ -188,7 +189,8 @@ class CapsuleEditorController extends AbstractController
->htmlTemplate('capsule/editors/email_editor.html.twig') ->htmlTemplate('capsule/editors/email_editor.html.twig')
->context([ ->context([
'user' => $current_user, 'user' => $current_user,
'capsule' => $capsule 'capsule' => $capsule,
'member_url_external' => $_ENV['MEMBER_URL_EXTERNAL']
]); ]);
$this->mailer->send($email); $this->mailer->send($email);
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<div class="col-6"> <div class="col-6">
<p class="alert"> <p class="alert">
{{ 'editors.add.user.email.text'|trans({'%user_name%': user.getFullName(), '%capsule_name%': capsule.getName()}) }} {{ 'editors.add.user.email.text'|trans({'%user_name%': user.getFullName(), '%capsule_name%': capsule.getName()}) }}
<a href="{{ member_url_external }}{{ capsule.getEditionLink() }}">
{{ editors.add.user.email.link }}
</a>
</p> </p>
<p>{{ 'general.greeting'|trans }}</p> <p>{{ 'general.greeting'|trans }}</p>
......
...@@ -134,3 +134,4 @@ editors: ...@@ -134,3 +134,4 @@ editors:
title: New capsule on your list title: New capsule on your list
text: You have been add by %user_name% as editor of the capsule "%capsule_name%". text: You have been add by %user_name% as editor of the capsule "%capsule_name%".
You can now access and edit it. You will find the capsule in your capsule list. You can now access and edit it. You will find the capsule in your capsule list.
link: Go to capsule edition page
...@@ -132,3 +132,4 @@ editors: ...@@ -132,3 +132,4 @@ editors:
title: Nouvelle capsule dans votre liste title: Nouvelle capsule dans votre liste
text: Vous avez été ajouté par %user_name% en tant qu'éditeur de la capsule "%capsule_name%". text: Vous avez été ajouté par %user_name% en tant qu'éditeur de la capsule "%capsule_name%".
Vous pouvez maintenant y accéder et l'éditer. Vous la retrouverez dans la liste de vos capsules. Vous pouvez maintenant y accéder et l'éditer. Vous la retrouverez dans la liste de vos capsules.
link: Se rendre sur la page d'édition de la capsule
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment