Skip to content

Commit e29cb33

Browse files
committed
reworked audit logs table to align with error reports
1 parent 23130ab commit e29cb33

4 files changed

Lines changed: 84 additions & 5 deletions

File tree

app/assets/stylesheets/audit_logs.scss

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
@import 'variables';
22

33
.audit-log-filters {
4-
.form-group-horizontal .actions, .select2-container {
4+
5+
.form-group-horizontal .actions,
6+
.select2-container {
57
height: 37px;
68
margin: 4px 0px;
79
}
@@ -34,3 +36,22 @@
3436
.audit-log-table-wrapper {
3537
overflow: scroll;
3638
}
39+
40+
.audit-log-summary {
41+
display: flex;
42+
align-items: center;
43+
gap: 1em;
44+
word-break: break-word;
45+
46+
&[open] {
47+
margin: 0;
48+
}
49+
50+
&::before {
51+
top: unset;
52+
}
53+
54+
.details {
55+
flex: 1;
56+
}
57+
}

app/helpers/admin_helper.rb

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1-
# Provides helper methods for use by views under <tt>AdminController</tt>.
21
module AdminHelper
2+
# Renders related model for a given log
3+
# @param log [AuditLog] log to render related model for
4+
# @return [String] rendered related model
5+
def rendered_related(log)
6+
return '' unless log.related.present?
7+
8+
if log.related.is_a?(User)
9+
return user_link(log.related)
10+
end
11+
12+
base = "#{log.related_type} ##{log.related_id}"
13+
14+
if log.related.respond_to?(:name)
15+
"#{base} (#{log.related.name})"
16+
else
17+
base
18+
end
19+
end
320
end
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<%#
2+
"Renders an audit log item
3+
4+
Variables:
5+
log : AuditLog to render
6+
"%>
7+
8+
<details class="audit-log">
9+
<summary class="audit-log-summary">
10+
<span class="details">
11+
<strong><%= log.event_type.humanize %></strong>
12+
<br/>
13+
<span class="has-font-size-caption has-color-tertiary-600">
14+
by <%= user_link(log.user) %><% if log.related.present? %>
15+
for <%= rendered_related(log) %>
16+
<% end %>
17+
</span>
18+
</span>
19+
<span class="has-padding-right-2 has-float-right has-color-tertiary-600"
20+
title="<%= log.created_at.iso8601 %>">
21+
<%= time_ago_in_words(log.created_at.iso8601) %> ago
22+
</span>
23+
</summary>
24+
25+
<p>
26+
<strong><%= t('g.type').capitalize %>:</strong>
27+
<%= log.log_type.humanize %><br/>
28+
29+
<strong><%= t('g.user').capitalize %>:</strong>
30+
<%= user_link(log.user) %><br/>
31+
32+
<% if log.related.present? %>
33+
<strong><%= t('g.related').capitalize %>:</strong>
34+
<%= rendered_related(log) %><br/>
35+
<% end %>
36+
</p>
37+
38+
<% if log.comment.present? %>
39+
<pre><%= log.comment %></pre>
40+
<% end %>
41+
</details>

app/views/admin/audit_logs.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
</div>
4949
</div>
5050

51-
<div class="audit-log-table-wrapper">
52-
<%= render 'log_table' %>
53-
</div>
51+
<% @logs.each do |log| %>
52+
<%= render 'admin/audit_log', log: log %>
53+
<% end %>
5454

5555
<div class="has-padding-top-4">
5656
<%= will_paginate @logs, renderer: BootstrapPagination::Rails %>

0 commit comments

Comments
 (0)