Skip to content

Commit d1a39f7

Browse files
committed
Updated user activity log table
1 parent bb28056 commit d1a39f7

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

app/views/hyrax/users/_activity_log.html.erb

+15-9
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,23 @@
77
</tr>
88
</thead>
99
<tbody>
10-
<% events.each do |event| %>
11-
<% next if event[:action].blank? or event[:timestamp].blank? %>
10+
<% valid_events = events.reject { |event| event[:action].blank? || event[:timestamp].blank? } %>
11+
<% if valid_events.empty? %>
1212
<tr>
13-
<td class="ensure-wrapped"><%= sanitize event[:action] %></td>
14-
<% time = Time.zone.at(event[:timestamp].to_i) %>
15-
<td data-sort="<%= time.getutc.iso8601(5) %>">
16-
<relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
17-
<%= time.to_formatted_s(:long_ordinal) %>
18-
</relative-time>
19-
</td>
13+
<td colspan="2">No user activity</td>
2014
</tr>
15+
<% else %>
16+
<% valid_events.each do |event| %>
17+
<tr>
18+
<td class="ensure-wrapped"><%= sanitize event[:action] %></td>
19+
<% time = Time.zone.at(event[:timestamp].to_i) %>
20+
<td data-sort="<%= time.getutc.iso8601(5) %>">
21+
<relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
22+
<%= time.to_formatted_s(:long_ordinal) %>
23+
</relative-time>
24+
</td>
25+
</tr>
26+
<% end %>
2127
<% end %>
2228
</tbody>
2329
</table>

0 commit comments

Comments
 (0)