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

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

Browse Source 
# Conflicts:
#	src/main/resources/templates/editMembers.html
This commit is contained in:
killerber4t
2020-03-19 15:55:59 +01:00
parent c343b5adbe d9388c282c
commit d2b5b44a0d
10 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,11 +67,10 @@
<tr>
<th scope="col">Mitglied</th>
<th scope="col" style="width: 180px">Rolle</th>
<th scope="col" style="width: 270px">Optionen</th>
<th scope="col" >Optionen</th>
</tr>
</thead>
<tbody class="table-striped">
<tr th:each="member : ${group.getMembers()}">
<th th:text="${member.getId()}"></th>
<td>
@ -84,7 +83,7 @@
type="hidden">
<input th:name="user_id" th:value="${member.getId()}"
type="hidden">
<button class="btn btn-warning btn-sm" type="submit">Rolle
<button class="btn btn-warning btn-sm" type="submit">Rolle
ändern
</button><!-- th:if -->
</form>
@ -93,7 +92,7 @@
type="hidden">
<input th:name="user_id" th:value="${member.getId()}"
type="hidden">
<button class="btn btn-danger btn-sm">Mitglied entfernen
<button th:if='${member.getId() != account.getName()}' class="btn btn-danger btn-sm">Mitglied entfernen
</button>
</form>
</td>