Merge branch 'master' into design-fix

2020-03-23 12:57:57 +01:00
parent d3608e5043 6506ce7bbe
commit de2c1ae245
5 changed files with 20 additions and 10 deletions
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@ -61,7 +61,7 @@
                    </form>
                    <form action="/gruppen2/deleteGroup" method="post">
                        <button class="btn btn-danger" style="border-style: none; margin: 5px"
-                                th:name="group_id" th:value="${group.getId()}"
+                                th:name="group_id" th:value="${group.getId()}" th:if="${group.getRoles().get(user.getId()) == admin}"
                                type="submit">Gruppe löschen
                        </button>
                    </form>