Changeset 6f91f99 in Git for src/main/resources/templates

Timestamp:

02/09/22 15:46:58 (3 years ago)

Author:

Test <matonikolov77@…>

Branches:

main

Children:

8f1b7e9

Parents:

967b414

Message:

Refactored reply repository and discussion repository

File:

• src/main/resources/templates/discussionsList.html (modified) (2 diffs)

src/main/resources/templates/discussionsList.html

@@ -31 +31 @@
                                 <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a>
                             </td>
-                            <td th:each="like : ${likes}" th:if="${like.getDiscussionId().equals(disc.getDiscussionId())}" th:text="${like.getLikes()}" class="likes_count">
+                            <td th:text="${disc.getLikes()}" class="likes_count">
                             </td>
                             <td th:text="${disc.getDate()}"></td>
@@ -41 +41 @@
                             <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
                             <td th:if="${!disc.getUser().equals(user)}">
-                                <a class='btn btn-success button-like-discussion-alt' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
-                                <a class='btn btn-danger button-unlike-discussion-alt' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
+                                <a class='btn btn-success button-like-discussion-alt' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc?.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
+                                <a class='btn btn-danger button-unlike-discussion-alt' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc?.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
                             </td>
                             </th:block>