Pagination fix (part 2)

Description

I accidently did not push the half of the latest MR to GitLab. This is the other bug fix and also includes the changelog. Sorry for the inconvience. (Also the pagination is now above the buttons like before).

Screenshots

Checklist

• I have added tests for functionality I added and/or changed
• I have changed the database schema
  • I have added migrations
• I have added the required changelog entries
• I have run my branch and ensured all functionality is still working as intended

Closes

src/main/resources/templates/puzzleList.html

@@ -33,7 +33,7 @@
                 <th>Creator</th>
                 <th>Tries</th>
                 <th:block
-                    th:if="${@authorisationService.canAssignToDay() and param.showSolution != null}">
+                    th:if="${(@authorisationService.canAssignToDay() || @authorisationService.canEditPuzzlesOfUser(user)) and param.showSolution != null}">
                     <th>Solution</th>
                 </th:block>
             </tr>
@@ -72,7 +72,7 @@
                         </th:block>
                     </td>
                     <th:block
-                        th:if="${@authorisationService.canAssignToDay() and param.showSolution != null}">
+                        th:if="${(@authorisationService.canAssignToDay() || @authorisationService.canEditPuzzlesOfUser(user)) and param.showSolution != null}">
                         <td>
                             <span th:text="${puzzle.getSolution()}"></span>
                         </td>
@@ -80,6 +80,7 @@
                 </tr>
             </th:block>
         </table>
+        <th:block layout:replace="~{pagination :: pagination(page=${puzzles}, size=5)}"></th:block>
         <th-block
             th:if="${@authorisationService.canAssignToDay() || @authorisationService.canEditPuzzlesOfUser(user)}">
             <th-block th:if="${param.unassigned == null}">
@@ -101,6 +102,5 @@
                 <a class="link" href="?"><button class="button">Hide solutions</button></a>
             </th-block>
         </th-block>
-        <th:block layout:replace="~{pagination :: pagination(page=${puzzles}, size=5)}"></th:block>
     </div>
 </html>