jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bans: merge banner name + timestamp into one column.

Browse Source
This commit is contained in:
evazion
2019-10-30 23:10:39 -05:00
parent f4b3d4e075
commit 64881d8840
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/bans/index.html.erb
View File

@@ -7,11 +7,10 @@
<table class="striped autofit"> <table class="striped autofit">
<thead> <thead>
<tr> <tr>
<th>User</th> <th>Banned User</th>
<th>Banner</th>
<th>Banned</th>
<th>Duration</th> <th>Duration</th>
<th>Reason</th> <th>Reason</th>
<th>Banner</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@@ -22,17 +21,17 @@
<%= link_to_user(ban.user) %> <%= link_to_user(ban.user) %>
<%= link_to "»", bans_path(search: search_params.merge(user_name: ban.user.name)) %> <%= link_to "»", bans_path(search: search_params.merge(user_name: ban.user.name)) %>
</td> </td>
<td>
<%= link_to_user(ban.banner) %>
<%= link_to "»", bans_path(search: search_params.merge(banner_name: ban.banner.name)) %>
</td>
<td><%= time_ago_in_words_tagged(ban.created_at) %></td>
<td><%= humanized_duration(ban.created_at, ban.expires_at) %></td> <td><%= humanized_duration(ban.created_at, ban.expires_at) %></td>
<td class="col-expand"> <td class="col-expand">
<div class="prose"> <div class="prose">
<%= format_text ban.reason %> <%= format_text ban.reason %>
</div> </div>
</td> </td>
<td>
<%= link_to_user ban.banner %>
<%= link_to "»", bans_path(search: { banner_name: ban.banner.name }) %>
<div><%= time_ago_in_words_tagged(ban.created_at) %></div>
</td>
<td> <td>
<% if CurrentUser.is_moderator? %> <% if CurrentUser.is_moderator? %>
<%= link_to "Edit", edit_ban_path(ban) %> <%= link_to "Edit", edit_ban_path(ban) %>