diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-01-16 13:23:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 13:23:50 +0100 |
| commit | 8e84ebf0cb211c1d94145399b05c9f2ad0e4d4b0 (patch) | |
| tree | ebd30c6287a50f6b8c21700b8a3000c4f45070a1 /app/views | |
| parent | b52fdb4c6f28b6f09861f1bc856079bb60391055 (diff) | |
Remove IP tracking columns from users table (#16409)
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 10 | ||||
| -rw-r--r-- | app/views/admin_mailer/new_pending_account.text.erb | 2 |
2 files changed, 7 insertions, 5 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') diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb index bcc251819..a8a2a35fa 100644 --- a/app/views/admin_mailer/new_pending_account.text.erb +++ b/app/views/admin_mailer/new_pending_account.text.erb @@ -3,7 +3,7 @@ <%= raw t('admin_mailer.new_pending_account.body') %> <%= @account.user_email %> (@<%= @account.username %>) -<%= @account.user_current_sign_in_ip %> +<%= @account.user_sign_up_ip %> <% if @account.user&.invite_request&.text.present? %> <%= quote_wrap(@account.user&.invite_request&.text) %> |