diff --git a/components/Conversation/Conversation.php b/components/Conversation/Conversation.php index c56c3f6e76..ad5bf5a31d 100644 --- a/components/Conversation/Conversation.php +++ b/components/Conversation/Conversation.php @@ -34,6 +34,8 @@ use App\Entity\Activity; use App\Entity\Actor; use App\Entity\Note; use App\Util\Common; +use App\Util\Exception\RedirectException; +use App\Util\Formatting; use Component\Conversation\Entity\Conversation as ConversationEntity; use Component\Conversation\Entity\ConversationMute; use Functional as F; @@ -194,6 +196,17 @@ class Conversation extends Component return Event::next; } + /** + * Add minimal Note card to RightPanel template + * + * @throws RedirectException + */ + public function onPrependPostingForm(Request $request, array &$elements) + { + $elements[] = Formatting::twigRenderFile('cards/note/macro_note_minimal_wrapper.html.twig', ['note' => Note::getById((int) $request->query->get('reply_to_id'))]); + return Event::next; + } + /** * Event launched when deleting given Note, it's deletion implies further changes to object related to this Note. * Please note, **replies are NOT deleted**, their reply_to is only set to null since this Note no longer exists. diff --git a/components/RightPanel/templates/right_panel/view.html.twig b/components/RightPanel/templates/right_panel/view.html.twig index 2fc95259f0..f67f221cd4 100644 --- a/components/RightPanel/templates/right_panel/view.html.twig +++ b/components/RightPanel/templates/right_panel/view.html.twig @@ -1,7 +1,8 @@ {% block rightpanel %} +{% set current_path = app.request.get('_route') %} - +