Merge pull request #72 from claroline/5.x-stable

5.x stable

Author: ngodfraind

Repository/ForumRepository.php

@@ -79,11 +79,10 @@ public function findCategories(Forum $forum, $getQuery = false)
     {
         $dql = "
             SELECT c.id as id,
-            count(m) as count_messages,
+            count(s) as count_subjects,
             c.name as name
             FROM Claroline\ForumBundle\Entity\Category c
             LEFT JOIN c.subjects s
-            LEFT JOIN s.messages m
             JOIN c.forum forum
             WHERE forum.id = :forumId
             GROUP BY c

Resources/translations/forum.en.yml

@@ -39,6 +39,7 @@ started_by: Initiated by
 stick: Stick
 stuck: Stuck
 subject: Topic
+subjects: Topics
 subjets_per_page: Subjects per page
 subscribe_mail_list: Subscribe to notifications
 unstick: Unstick

Resources/translations/forum.es.yml

@@ -38,6 +38,7 @@ started_by: 'Iniciado por'
 stick: Anclar
 stuck: Anclado
 subject: Tema
+subjects: Temas
 subjets_per_page: 'Temas por pagina'
 subscribe_mail_list: 'Suscríbase a las notificaciones'
 unstick: Desanclar

Resources/translations/forum.fr.yml

@@ -39,6 +39,7 @@ started_by: Initié par
 stick: Épingler
 stuck: Épinglé
 subject: Sujet
+subjects: Sujets
 subjets_per_page: Sujets par page
 subscribe_mail_list: Recevoir les notifications
 unstick: Désépingler

Resources/views/Forum/messages.html.twig

@@ -149,7 +149,7 @@
             {% if not subject.isClosed() %}
                 <textarea class="forum-answer claroline-tiny-mce hide"></textarea>
                 {# something may be wrong here because _token doesn't always exists #}
-                {{ form_widget(form._token) }}
+                {% if form._token is defined %} {{ form_widget(form._token) }} {% endif %}
             {% endif %}
             </div>
         {% endif %}

Resources/views/Forum/subjects.html.twig

@@ -128,7 +128,7 @@
                             {{ subject['subject_created']|intl_date_format() }}
                         </td>
                         <td>
-                            {{ subject['count_messages'] }}
+                            {{ subject['count_messages'] - 1 }}
                         </td>
                         <td>
                             {% if lastMessages[subject['id']] is defined and lastMessages[subject['id']] is not empty %}
@@ -145,7 +145,7 @@
                                 {{ lastMessages[subject['id']].getAuthor() }}
                                 <br>
                                 {{ lastMessages[subject['id']].getModificationDate()|intl_date_format() }}
-                                
+
                                 {% if isNew %}
                                     </b>
                                 {% endif %}

Resources/views/index.html.twig

@@ -90,7 +90,7 @@
                 <thead>
                     <tr>
                         <th>{{ 'category'|trans({}, 'forum') }}</th>
-                        <th>{{ 'messages'|trans({}, 'forum') }} </th>
+                        <th>{{ 'subjects'|trans({}, 'forum') }} </th>
                         <th>{{ 'last_message'|trans({}, 'forum') }}</th>
                         {% if isModerator %}
                             <th></th>
@@ -113,7 +113,7 @@
                            {% endif %}
                             <br>
                         <td>
-                            {{ category['count_messages'] }}
+                            {{ category['count_subjects'] }}
                         </td>
                         <td>
                             {{ category['last_message_author'] }}