Merge remote-tracking branch 'origin/master' into fixSomeErrors

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

src/main/resources/templates/createOrga.html

@@ -54,7 +54,7 @@
                         <div class="form-group mt-3">
                             <label for="userMaximum">Teilnehmeranzahl</label>
                             <input class="form-control" id="userMaximum" required th:name="userMaximum"
-                                   type="number" min="1">
+                                   type="number" min="1" max="10000">
                         </div>
                         <div class="custom-control custom-checkbox">
                             <input class="custom-control-input" id="visibility" th:name="visibility"

src/main/resources/templates/detailsMember.html

@@ -59,6 +59,12 @@
                                 type="submit">Gruppe verlassen
                         </button>
                     </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:if="${group.getRoles().get(user.getId()) == admin}"
+                                type="submit">Gruppe löschen
+                        </button>
+                    </form>
                 </div>
             </div>
             <div class="col-3" style="white-space: nowrap">

src/main/resources/templates/editMembers.html

@@ -99,7 +99,7 @@
                                                type="hidden">
                                         <input th:name="user_id" th:value="${member.getId()}"
                                                type="hidden">
-                                        <button class="btn btn-danger btn-sm" style="margin: 5px">Mitglied entfernen</button>
+                                        <button class="btn btn-danger btn-sm" style="margin: 5px" th:if='!${account.getName().equals(member.getId())}'>Mitglied entfernen</button>
                                     </form>
                                 </div>
                             </td>