diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 22:39:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 22:39:35 +0100 |
| commit | a85912b0d6d2ee68aa35794fbb51c5358768c092 (patch) | |
| tree | af0dde21359576102ab8dcf8a1dc3342f67bb71c /app/views/admin/accounts/show.html.haml | |
| parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
| parent | 278bd61d6f507e56350e7f14caaeaa954700ecd8 (diff) | |
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/accounts/show.html.haml')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 64cfc9a77..3867d1b19 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -156,12 +156,14 @@ %time.formatted{ datetime: @account.created_at.iso8601, title: l(@account.created_at) }= l @account.created_at %td - - @account.user.recent_ips.each_with_index do |(_, ip), i| + - recent_ips = @account.user.ips.order(used_at: :desc).to_a + + - recent_ips.each_with_index do |recent_ip, i| %tr - if i.zero? - %th{ rowspan: @account.user.recent_ips.size }= t('admin.accounts.most_recent_ip') - %td= ip - %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: ip) + %th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip') + %td= recent_ip.ip + %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip) %tr %th= t('admin.accounts.most_recent_activity') |