From a60364ca7d26c82c9353980d0966d37e9aa66014 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jun 2019 03:24:10 +0200
Subject: [PATCH] Add waiting time to list of pending accounts in admin UI
(#10985)
---
app/controllers/admin/accounts_controller.rb | 4 ++--
app/views/admin/pending_accounts/_account.html.haml | 2 ++
config/locales/en.yml | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index e7795e95c..b0d45ce47 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -48,13 +48,13 @@ module Admin
def approve
authorize @account.user, :approve?
@account.user.approve!
- redirect_to admin_accounts_path(pending: '1')
+ redirect_to admin_pending_accounts_path
end
def reject
authorize @account.user, :reject?
SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true)
- redirect_to admin_accounts_path(pending: '1')
+ redirect_to admin_pending_accounts_path
end
def unsilence
diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml
index 1ed5dafdd..7a9796a67 100644
--- a/app/views/admin/pending_accounts/_account.html.haml
+++ b/app/views/admin/pending_accounts/_account.html.haml
@@ -8,6 +8,8 @@
= "(@#{account.username})"
%br/
= account.user_current_sign_in_ip
+ •
+ = t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at)
- if account.user&.invite_request&.text&.present?
.pending-account__body
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4acea6dc0..3b32e41a6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -174,6 +174,7 @@ en:
statuses: Statuses
subscribe: Subscribe
suspended: Suspended
+ time_in_queue: Waiting in queue %{time}
title: Accounts
unconfirmed_email: Unconfirmed email
undo_silenced: Undo silence