Add number of pending accounts and pending hashtags to admin dashboard (#11514)

This commit is contained in:
Eugen Rochko 2019-08-07 16:13:34 +02:00 committed by GitHub
parent b169874828
commit bfb43d7104
4 changed files with 18 additions and 6 deletions

View file

@ -5,6 +5,7 @@ module Admin
class DashboardController < BaseController class DashboardController < BaseController
def index def index
@users_count = User.count @users_count = User.count
@pending_users_count = User.pending.count
@registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0 @registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0
@logins_week = Redis.current.pfcount("activity:logins:#{current_week}") @logins_week = Redis.current.pfcount("activity:logins:#{current_week}")
@interactions_week = Redis.current.get("activity:interactions:#{current_week}") || 0 @interactions_week = Redis.current.get("activity:interactions:#{current_week}") || 0
@ -19,7 +20,7 @@ module Admin
@redis_version = redis_info['redis_version'] @redis_version = redis_info['redis_version']
@reports_count = Report.unresolved.count @reports_count = Report.unresolved.count
@queue_backlog = Sidekiq::Stats.new.enqueued @queue_backlog = Sidekiq::Stats.new.enqueued
@recent_users = User.confirmed.recent.includes(:account).limit(4) @recent_users = User.confirmed.recent.includes(:account).limit(8)
@database_size = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size'] @database_size = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size']
@redis_size = redis_info['used_memory'] @redis_size = redis_info['used_memory']
@ldap_enabled = ENV['LDAP_ENABLED'] == 'true' @ldap_enabled = ENV['LDAP_ENABLED'] == 'true'
@ -28,6 +29,7 @@ module Admin
@pam_enabled = ENV['PAM_ENABLED'] == 'true' @pam_enabled = ENV['PAM_ENABLED'] == 'true'
@hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true' @hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
@trending_hashtags = TrendingTags.get(10, filtered: false) @trending_hashtags = TrendingTags.get(10, filtered: false)
@pending_tags_count = Tag.pending_review.count
@authorized_fetch = authorized_fetch_mode? @authorized_fetch = authorized_fetch_mode?
@whitelist_enabled = whitelist_mode? @whitelist_enabled = whitelist_mode?
@profile_directory = Setting.profile_directory @profile_directory = Setting.profile_directory

View file

@ -15,13 +15,21 @@
.dashboard__counters__num= number_with_delimiter @logins_week .dashboard__counters__num= number_with_delimiter @logins_week
.dashboard__counters__label= t 'admin.dashboard.week_users_active' .dashboard__counters__label= t 'admin.dashboard.week_users_active'
%div %div
%div = link_to admin_pending_accounts_path do
.dashboard__counters__num= number_with_delimiter @interactions_week .dashboard__counters__num= number_with_delimiter @pending_users_count
.dashboard__counters__label= t 'admin.dashboard.week_interactions' .dashboard__counters__label= t 'admin.dashboard.pending_users'
%div %div
= link_to admin_reports_url do = link_to admin_reports_url do
.dashboard__counters__num= number_with_delimiter @reports_count .dashboard__counters__num= number_with_delimiter @reports_count
.dashboard__counters__label= t 'admin.dashboard.open_reports' .dashboard__counters__label= t 'admin.dashboard.open_reports'
%div
= link_to admin_tags_path(review: 'pending_review') do
.dashboard__counters__num= number_with_delimiter @pending_tags_count
.dashboard__counters__label= t 'admin.dashboard.pending_tags'
%div
%div
.dashboard__counters__num= number_with_delimiter @interactions_week
.dashboard__counters__label= t 'admin.dashboard.week_interactions'
%div %div
= link_to sidekiq_url do = link_to sidekiq_url do
.dashboard__counters__num= number_with_delimiter @queue_backlog .dashboard__counters__num= number_with_delimiter @queue_backlog

View file

@ -9,8 +9,8 @@
.fields-group .fields-group
= f.input :usable, as: :boolean, wrapper: :with_label = f.input :usable, as: :boolean, wrapper: :with_label
= f.input :trendable, as: :boolean, wrapper: :with_label = f.input :trendable, as: :boolean, wrapper: :with_label, disabled: !Setting.trends
= f.input :listable, as: :boolean, wrapper: :with_label = f.input :listable, as: :boolean, wrapper: :with_label, disabled: !Setting.profile_directory
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

View file

@ -260,6 +260,8 @@ en:
features: Features features: Features
hidden_service: Federation with hidden services hidden_service: Federation with hidden services
open_reports: open reports open_reports: open reports
pending_tags: hashtags waiting for review
pending_users: users waiting for review
recent_users: Recent users recent_users: Recent users
search: Full-text search search: Full-text search
single_user_mode: Single user mode single_user_mode: Single user mode