Эх сурвалжийг харах

ajout username passé en param et affichage rt

Clément K 4 жил өмнө
parent
commit
fa5df71cc4

+ 7 - 1
src/Controller/HashtagController.php

@@ -19,6 +19,11 @@ class HashtagController extends AbstractController
     #[Route('/hashtag/{name}', name: 'hashtag')]
     public function index($name): Response
     {
+        $session = $this->get('session');
+
+        if (null === $session->get('user')) {
+            return  $this->redirectToRoute('login');
+        }
         $em = $this->getDoctrine()->getManager();
         $repository_hashtag = $em->getRepository(Hashtag::class);
         $hashtag = $repository_hashtag->findOneBy(array("name" => $name));
@@ -27,7 +32,8 @@ class HashtagController extends AbstractController
             usort($messages, array($this, "cmp_array"));
             return $this->render('hashtag/index.html.twig', [
                 'controller_name' => 'HashtagController',
-                'messages' => $messages
+                'messages' => $messages,
+                'username' => $session->get('user'),
             ]);
         }
         return new Response("Hashtag non existant");

+ 2 - 1
src/Controller/PrivateDiscussionController.php

@@ -47,7 +47,8 @@ class PrivateDiscussionController extends AbstractController
         return $this->render('private_discussion/index.html.twig', [
             'controller_name' => 'PrivateDiscussionController',
             'messages' => $messages,
-            'form' => $form->createView()
+            'form' => $form->createView(),
+            'username' => $session->get('user'),
         ]);
     }
 }

+ 2 - 1
src/Controller/PrivateDiscussionsController.php

@@ -73,7 +73,8 @@ class PrivateDiscussionsController extends AbstractController
         return $this->render('private_discussions/index.html.twig', [
             'controller_name' => 'PrivateDiscussionsController',
             'form' => $form->createView(),
-            'private_discussions' => $private_discussions
+            'private_discussions' => $private_discussions,
+            'username' => $session->get('user'),
         ]);
     }
 }

+ 1 - 2
templates/home/index.html.twig

@@ -20,8 +20,7 @@
 					</h5>
 					<h6 class="card-subtitle mb-2 text-muted">{{ msg.getDate()|date('H:i - d/m/Y') }}</h6>
 					<p class="card-text">{{ msg.text | striptags('<a>') | raw }}</p>
-					<a href="#" class="card-link">RT</a>
-					{# <a href="{{ path('rt_message', {'msgId': msg.getId() }) }}" class="card-link">RT</a> #}
+                    <a href="{{ path('rt_message', {'msgId': msg.getId() }) }}" class="card-link">RT</a>
 				</div>
 			</div>
 		{% endfor %}