summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-03-08 15:39:13 +0100
committerGitHub <noreply@github.com>2020-03-08 15:39:13 +0100
commit4a4cd686c1d556e7b5246ddc309085243b4a051b (patch)
tree3dcea828b14d6735949e9ce141ef27fa86c1cba8 /app/views
parent2e18b1a2a2976f04f84e92d187b0620223a64fa6 (diff)
Add sorting by username, creation and last activity in moderation view (#13076)
* Add ability to order accounts in moderation view * Display last status date in “Most recent activity” for remote users
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/accounts/_account.html.haml2
-rw-r--r--app/views/admin/accounts/index.html.haml6
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index b057d3e42e0..44b10af6e2e 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -11,6 +11,8 @@
%td
- if account.user_current_sign_in_at
%time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
+ - elsif account.last_status_at.present?
+ %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at
- else
\-
%td
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 3a85324c9a0..7592161c9dc 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -19,6 +19,12 @@
%ul
%li= filter_link_to t('admin.accounts.moderation.all'), staff: nil
%li= filter_link_to t('admin.accounts.roles.staff'), staff: '1'
+ .filter-subset
+ %strong= t 'generic.order_by'
+ %ul
+ %li= filter_link_to t('relationships.most_recent'), order: nil
+ %li= filter_link_to t('admin.accounts.username'), order: 'alphabetic'
+ %li= filter_link_to t('relationships.last_active'), order: 'active'
= form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
.fields-group