1
0
mirror of synced 2025-10-28 18:19:17 +00:00

bug fix when multiple memberships & minors

This commit is contained in:
Valentin PUCCETTI
2023-09-10 22:22:28 +02:00
parent a3b8a865fd
commit c8efefdc4e
9 changed files with 108 additions and 70 deletions

View File

@@ -25,15 +25,15 @@
<table class="table my-0" id="tableEnabled">
<thead>
<tr>
<th>Display name</th>
<th>github id</th>
<th>Username</th>
<th>id</th>
<th></th>
</tr>
</thead>
<tbody>
<% outGroup.forEach(function (member) { %>
<tr>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= member.avatar %>"><%= member.displayName %></td>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= member.avatar %>"><%= member.login %></td>
<td><%= member.id %></td>
<td style="text-align: right;"><a class="btn btn-sm btn-success" href="/admin/members/<%= group.name %>/add/<%= member.id %>"><i class="text-white fa fa-plus"></i></button></td>
</tr>
@@ -44,7 +44,6 @@
</tfoot>
</table>
</div>
<div class="mb-3"><button class="btn btn-primary btn-sm" type="submit">Update group</button></div>
</div>
<div class="col-md-6">
@@ -64,15 +63,15 @@
<table class="table my-0" id="tableEnabled">
<thead>
<tr>
<th>Display name</th>
<th>github id</th>
<th>username</th>
<th>id</th>
<th></th>
</tr>
</thead>
<tbody>
<% inGroup.forEach(function (member) { %>
<tr>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= member.avatar %>"><%= member.displayName %></td>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= member.avatar %>"><%= member.login %></td>
<td><%= member.id %></td>
<td style="text-align: right;"><a class="btn btn-sm btn-danger" href="/admin/members/<%= group.name %>/delete/<%= member.id %>"><i class="far fa-trash-alt"></i></a></td>

View File

@@ -22,22 +22,19 @@
<table class="table my-0" id="tableEnabled">
<thead>
<tr>
<th>Display name</th>
<th>github id</th>
<th>Username</th>
<th>id</th>
<th>Admin</th>
<th>Groups</th>
<th>Last login</th>
</tr>
</thead>
<tbody>
<% users.forEach(function (user) { %>
<tr>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= user.avatar %>"><%= user.displayName %></td>
<td><img class="rounded-circle me-2" width="30" height="30" src="<%= user.avatar %>"><%= user.login %></td>
<td><%= user.id %></td>
<td><%= user.admin %></td>
<td>
<span class="badge bg-primary">admin</span>
</td>
<td><%= user.updatedAt %></td>
</tr>
<% }) %>