hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add link to search for users connected from the same IP address (#12157) 

* Add link to search for users connected from the same IP address

Fixes #11949

* Fix missing cell in admin account view table
signup-info-prompt
ThibG 2019-10-24 22:49:26 +02:00 committed by Eugen Rochko
parent bcf694dce7
commit 15c192ce40
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/accounts/show.html.haml
View File

@ -143,12 +143,15 @@
%th= t('admin.accounts.most_recent_ip') %th= t('admin.accounts.most_recent_ip')
%td= @account.user_current_sign_in_ip %td= @account.user_current_sign_in_ip
%td %td
- if @account.user_current_sign_in_ip
= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: @account.user_current_sign_in_ip)
%tr %tr
%th= t('admin.accounts.most_recent_activity') %th= t('admin.accounts.most_recent_activity')
%td %td
- if @account.user_current_sign_in_at - if @account.user_current_sign_in_at
%time.formatted{ datetime: @account.user_current_sign_in_at.iso8601, title: l(@account.user_current_sign_in_at) }= l @account.user_current_sign_in_at %time.formatted{ datetime: @account.user_current_sign_in_at.iso8601, title: l(@account.user_current_sign_in_at) }= l @account.user_current_sign_in_at
%td
- if @account.user&.invited? - if @account.user&.invited?
%tr %tr

1
config/locales/en.yml
View File

@ -175,6 +175,7 @@ en:
user: User user: User
salmon_url: Salmon URL salmon_url: Salmon URL
search: Search search: Search
search_same_ip: Other users with the same IP
shared_inbox_url: Shared inbox URL shared_inbox_url: Shared inbox URL
show: show:
created_reports: Made reports created_reports: Made reports