Skip to content

Commit 8174097

Browse files
committed
Include deleted certificates in access lists
Access Lists should retain deleted certificates till explicitly removed. Deleted certificates include a "Deleted" marker in a text-danger color.
1 parent c56bd56 commit 8174097

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

backend/models/access_list_clientcas.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ class AccessListClientCAs extends Model {
5353
join: {
5454
from: 'access_list_clientcas.certificate_id',
5555
to: 'certificate.id'
56-
},
57-
modify: function (qb) {
58-
qb.where('certificate.is_deleted', 0);
5956
}
6057
}
6158
};

frontend/js/app/nginx/access/form/clientca.ejs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<div class="text-muted">Expires: <%- formatDbDate(certificate.expires_on, 'Do MMMM YYYY, h:mm a') %></div>
99
</div>
1010
</div>
11+
<div class="col-auto align-self-center <% if (certificate.is_deleted == 1) { %>text-danger<% } %>">
12+
<% if (certificate.is_deleted == 1) { %><i>Deleted</i><% } %>
13+
</div>
1114
<div class="col-auto align-self-center">
1215
<button class="btn btn-sm btn-outline-danger btn-icon clientca_del" data-value="<%=certificate.id%>">
1316
<i class="fe fe-trash-2"></i>

0 commit comments

Comments
 (0)