christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge pull request #121 from hhu-propra2/fix_maxUser

Browse Source 
fix userMax
This commit is contained in:
XXNitram
2020-03-23 15:59:48 +01:00
committed by GitHub
parent 62efdb784d 27403f2712
commit 430336ae9c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -99,6 +99,9 @@ public class Gruppen2Controller {
Account account = keyCloakService.createAccountFromPrincipal(token);
List<User> userList = new ArrayList<>();
if(userMaximum == null){
userMaximum = 100000L;
}
if (!file.isEmpty()) {
try {
userList = CsvService.read(file.getInputStream());

4
src/main/resources/templates/editMembers.html
View File

@ -59,7 +59,7 @@
<div class="input-group-append">
<button class="btn btn-outline-secondary" style="background: #52a1eb; border-style: none"
th:name="group_id" th:value="${group.getId()}"
type="button">
type="submit">
<a style="color: white">Hinzufügen</a>
</button>
</div>
@ -70,7 +70,7 @@
<form action="/gruppen2/details/members/changeMaximum" method="post">
<div class="input-group mb-3" id="userMaximum">
<input class="form-control" placeholder="Maximale Teilnehmerzahl ändern..." th:name="maximum"
type="number" min="${group.getMembers().size()}" max="10000">
type="number" th:min="${group.getMembers().size()}" max="10000">
<div class="input-group-append">
<button class="btn btn-outline-secondary" style="background: #52a1eb; border-style: none"
th:name="group_id" th:value="${group.getId()}"