diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-28 16:25:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 16:25:55 +0100 |
| commit | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (patch) | |
| tree | 1c49c58aa3c45a4ccc5c513ed0539facaf6cc137 /app/views/admin/accounts | |
| parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
| parent | 046cd05a839896ffa3aedb3270c7487f0766bdf9 (diff) | |
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/accounts')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 40a936e86..9f1e3816b 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -143,12 +143,15 @@ %th= t('admin.accounts.most_recent_ip') %td= @account.user_current_sign_in_ip %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 %th= t('admin.accounts.most_recent_activity') %td - 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 + %td - if @account.user&.invited? %tr |