~cytrogen/masto-fe

a60364ca7d26c82c9353980d0966d37e9aa66014 — Eugen Rochko 6 years ago c672676
Add waiting time to list of pending accounts in admin UI (#10985)

M app/controllers/admin/accounts_controller.rb => app/controllers/admin/accounts_controller.rb +2 -2
@@ 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

M app/views/admin/pending_accounts/_account.html.haml => app/views/admin/pending_accounts/_account.html.haml +2 -0
@@ 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

M config/locales/en.yml => config/locales/en.yml +1 -0
@@ 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