Commit ace00cd6 authored by Matija Obreza's avatar Matija Obreza
Browse files

JSP fixes for user#accountType (extras for 66305db0)

parent e53c3361
......@@ -200,7 +200,7 @@
</a>
</li>
<li>
<a href="<c:url value="/profile/list" />"> <spring:message code="user.pulldown.users" />
<a href="<c:url value="/admin/users" />"> <spring:message code="user.pulldown.users" />
</a>
</li>
<li>
......
......@@ -18,11 +18,11 @@
<tbody>
<c:forEach items="${pagedData.content}" var="user" varStatus="status">
<tr>
<td class="col-xs-5"><c:if test="${not user.systemAccount}">
<td class="col-xs-5"><c:if test="${user.accountType != 'SYSTEM'}">
<a href="<c:url value="/admin/users/${user.uuid}" />"><c:out
value="${user.fullName}" /></a>
</c:if></td>
<td class="col-xs-2"><c:if test="${user.systemAccount}">SYSTEM</c:if>
<td class="col-xs-2"><c:if test="${user.accountType == 'SYSTEM'}">SYSTEM</c:if>
<c:if test="${not user.enabled}">DISABLED</c:if> <c:if
test="${user.accountLocked}">LOCKED</c:if></td>
<td class="col-xs-5"><c:out value="${user.email}" /></td>
......
......@@ -26,7 +26,7 @@
<div class="form-group">
<label class="col-lg-2 control-label"><spring:message code="user.account-status" /></label>
<div class="col-lg-5 form-control-static">
<c:if test="${user.systemAccount}">SYSTEM</c:if>
<c:if test="${user.accountType == 'SYSTEM'}">SYSTEM</c:if>
<c:if test="${not user.enabled}"><spring:message code="user.account-disabled" /></c:if>
<c:if test="${user.accountLocked}"><spring:message code="user.account-locked-until" />
<fmt:formatDate value="${user.lockedUntil}" type="time" />
......
......@@ -20,11 +20,11 @@
<table class="funny-list">
<c:forEach items="${pagedData.content}" var="user" varStatus="status">
<tr class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}">
<td><c:if test="${not user.systemAccount}"><a href="<c:url value="/profile/${user.uuid}" />"><c:out value="${user.fullName}" /></a></c:if></td>
<td><c:if test="${user.accountType != 'SYSTEM'}"><a href="<c:url value="/profile/${user.uuid}" />"><c:out value="${user.fullName}" /></a></c:if></td>
<td><c:out value="${user.uuid}" /></td>
<td><c:out value="${user.email}" /></td>
<td>
<c:if test="${user.systemAccount}">SYSTEM</c:if>
<c:if test="${user.accountType == 'SYSTEM'}">SYSTEM</c:if>
<c:if test="${not user.enabled}">DISABLED</c:if>
<c:if test="${user.accountLocked}">LOCKED</c:if>
</td>
......
......@@ -28,7 +28,7 @@
<div class="form-group">
<label class="col-lg-2 control-label"><spring:message code="user.account-status" /></label>
<div class="col-lg-5 form-control-static">
<c:if test="${user.systemAccount}">SYSTEM</c:if>
<c:if test="${user.accountType == 'SYSTEM'}">SYSTEM</c:if>
<c:if test="${not user.enabled}"><spring:message code="user.account-disabled" /></c:if>
<c:if test="${user.accountLocked}"><spring:message code="user.account-locked-until" />
<fmt:formatDate value="${user.lockedUntil}" type="time" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment