Bugfixes for user admin UI
parent
3fc63650cc
commit
0482a1e7ec
|
|
@ -216,7 +216,8 @@ public class UsersController {
|
|||
user.setBanned(true);
|
||||
userRepository.save(user);
|
||||
return String.format(
|
||||
"redirect:%s", mvc.uri("UsersController#getUsers")
|
||||
//"redirect:%s", mvc.uri("UsersController#getUsers")
|
||||
"redirect:users-groups-roles/users"
|
||||
);
|
||||
} else {
|
||||
userDetailsModel.addMessage(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<!DOCTYPE html [<!ENTITY times '×'>]>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
|
||||
|
|
@ -67,8 +66,9 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="#{UsersTableModel.users}" var="user">
|
||||
<tr>
|
||||
<c:forEach items="#{UsersTableModel.users}"
|
||||
var="user">
|
||||
<tr class="#{user.banned ? 'text-muted' : ''}">
|
||||
<td>#{user.name}</td>
|
||||
<td>#{user.givenName}</td>
|
||||
<td>#{user.familyName}</td>
|
||||
|
|
@ -93,58 +93,60 @@
|
|||
</a>
|
||||
</td>
|
||||
<td class="text-center action-col">
|
||||
<button class="btn btn-danger"
|
||||
data-toggle="modal"
|
||||
data-target="#confirm-disable-#{user.name}">
|
||||
<svg class="bi"
|
||||
width="1em"
|
||||
height="1em"
|
||||
fill="currentColor">
|
||||
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
|
||||
</svg>
|
||||
<span>
|
||||
#{AdminMessages['usersgroupsroles.users.disablebutton.label']}
|
||||
</span>
|
||||
</button>
|
||||
<div class="modal"
|
||||
id="confirm-disable-#{user.name}"
|
||||
tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}"
|
||||
class="modal-content"
|
||||
method="post">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-title">
|
||||
#{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
|
||||
</h3>
|
||||
<button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"
|
||||
class="close"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
#{AdminMessages.getMessage('usersgroupsroles.users.disable.confirm.message', [user.name])}
|
||||
<input name="confirmed"
|
||||
type="hidden"
|
||||
value="true" />
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-secondary"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
#{'usersgroupsroles.users.disable.confirm.cancel'}
|
||||
</button>
|
||||
<button class="btn btn-danger"
|
||||
data-dismiss="modal"
|
||||
type="submit">
|
||||
#{'usersgroupsroles.users.disable.confirm.yes'}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<c:if test="#{!user.banned}">
|
||||
<button class="btn btn-danger"
|
||||
data-toggle="modal"
|
||||
data-target="#confirm-disable-#{user.name}">
|
||||
<svg class="bi"
|
||||
width="1em"
|
||||
height="1em"
|
||||
fill="currentColor">
|
||||
<use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
|
||||
</svg>
|
||||
<span>
|
||||
#{AdminMessages['usersgroupsroles.users.disablebutton.label']}
|
||||
</span>
|
||||
</button>
|
||||
<div class="modal"
|
||||
id="confirm-disable-#{user.name}"
|
||||
tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}"
|
||||
class="modal-content"
|
||||
method="post">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-title">
|
||||
#{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
|
||||
</h3>
|
||||
<button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"
|
||||
class="close"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
#{AdminMessages.getMessage('usersgroupsroles.users.disable.confirm.message', [user.name])}
|
||||
<input name="confirmed"
|
||||
type="hidden"
|
||||
value="true" />
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-secondary"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}
|
||||
</button>
|
||||
<button class="btn btn-danger"
|
||||
data-submit-confirm-dialog="#confirm-disable-#{user.name}"
|
||||
type="submit">
|
||||
#{AdminMessages['usersgroupsroles.users.disable.confirm.yes']}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
import "bootstrap";
|
||||
|
||||
import { initFilterables } from "./filterable-list";
|
||||
|
||||
document.addEventListener("DOMContentReady", event => initFilterables());
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
/**
|
||||
* Not ready yet. Don' use
|
||||
*/
|
||||
|
||||
export function initFilterables(): void {
|
||||
document
|
||||
.querySelectorAll("*[data-filter]")
|
||||
|
|
|
|||
Loading…
Reference in New Issue