mirror of
https://github.com/yingziwu/mastodon.git
synced 2026-02-04 11:35:13 +00:00
Use tag filter for pending tag count on admin dashboard (#36404)
This commit is contained in:
parent
5bc7c4b7e8
commit
0152659245
2 changed files with 9 additions and 1 deletions
|
|
@ -9,10 +9,16 @@ module Admin
|
|||
|
||||
@pending_appeals_count = Appeal.pending.async_count
|
||||
@pending_reports_count = Report.unresolved.async_count
|
||||
@pending_tags_count = Tag.pending_review.async_count
|
||||
@pending_tags_count = pending_tags.async_count
|
||||
@pending_users_count = User.pending.async_count
|
||||
@system_checks = Admin::SystemCheck.perform(current_user)
|
||||
@time_period = (29.days.ago.to_date...Time.now.utc.to_date)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def pending_tags
|
||||
::Trends::TagFilter.new(status: :pending_review).results
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ RSpec.describe 'Admin Dashboard' do
|
|||
before do
|
||||
stub_system_checks
|
||||
Fabricate :software_update
|
||||
Fabricate :tag, requested_review_at: 5.minutes.ago
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
|
|
@ -18,6 +19,7 @@ RSpec.describe 'Admin Dashboard' do
|
|||
expect(page)
|
||||
.to have_title(I18n.t('admin.dashboard.title'))
|
||||
.and have_content(I18n.t('admin.system_checks.software_version_patch_check.message_html'))
|
||||
.and have_content('0 pending hashtags')
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue