瀏覽代碼

Fixing message preview.

Julio Montoya 10 年之前
父節點
當前提交
b86b69956d

+ 2 - 2
app/config/routing.yml

@@ -29,7 +29,7 @@ avanzu_admin_profile:
 avanzu_admin_all_messages:
     path: /messages/
 avanzu_admin_show_message:
-    path: /messages/{messageid}/
+    path: /messages/{messageid}
 avanzu_admin_all_notifications:
     path: /notifications/
 avanzu_admin_show_notification:
@@ -37,7 +37,7 @@ avanzu_admin_show_notification:
 avanzu_admin_all_tasks:
     path: /tasks/
 avanzu_admin_show_task:
-    path: /tasks/{taskid}/
+    path: /tasks/{taskid}
 avanzu_admin_logout:
     path: /logout
 

+ 12 - 5
src/ChamiloLMS/CoreBundle/EventListener/MessageListener.php

@@ -10,11 +10,17 @@ class MessageListener
 {
     protected $container;
 
+    /**
+     * @param ContainerInterface $container
+     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
     }
 
+    /**
+     * @param MessageListEvent $event
+     */
     public function onListMessages(MessageListEvent $event)
     {
         foreach ($this->getMessages() as $message) {
@@ -22,21 +28,23 @@ class MessageListener
         }
     }
 
+    /**
+     * @return array
+     */
     protected function getMessages()
     {
-        return array();
-
         $threads = $this->container->get('fos_message.provider')->getInboxThreads();
+
         $security = $this->container->get('security.context');
         $token = $security->getToken();
-
         $user = $token->getUser();
+
         if (!empty($user)) {
             $messages = array();
 
             /** @var \ChamiloLMS\CoreBundle\Entity\Thread $thread */
             foreach ($threads as $thread) {
-                if ($thread->isReadByParticipant($user)) {
+                if (!$thread->isReadByParticipant($user)) {
                     foreach ($thread->getMessages() as $message) {
                         $messages[] = $message;
                     }
@@ -45,6 +53,5 @@ class MessageListener
 
             return $messages;
         }
-
     }
 }

+ 9 - 0
src/ChamiloLMS/CoreBundle/EventListener/ShowUserListener.php

@@ -11,11 +11,17 @@ class ShowUserListener
 {
     protected $container;
 
+    /**
+     * @param ContainerInterface $container
+     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
     }
 
+    /**
+     * @param ShowUserEvent $event
+     */
     public function onShowUser(ShowUserEvent $event)
     {
         $user = $this->getUser();
@@ -24,6 +30,9 @@ class ShowUserListener
         }
     }
 
+    /**
+     * @return mixed
+     */
     public function getUser()
     {
         /** @var  $security */