tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix nil error when viewing suspended domain in admin UI (#17765)

This commit is contained in:
Eugen Rochko 2022-03-14 05:27:37 +01:00 committed by GitHub
parent 74f406cfc9
commit 5db1f377ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/instance.rb
View File

@ -32,8 +32,12 @@ class Instance < ApplicationRecord
@delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
end
def purgeable?
unavailable? || domain_block&.suspend?
end
def unavailable?
unavailable_domain.present? || domain_block&.suspend?
unavailable_domain.present?
end
def failing?

2
app/views/admin/instances/show.html.haml
View File

@ -89,7 +89,7 @@
= t('admin.instances.availability.failures_recorded', count: @instance.delivery_failure_tracker.days)
= link_to t('admin.instances.delivery.clear'), clear_delivery_errors_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post } unless @instance.exhausted_deliveries_days.empty?
- if @instance.unavailable?
- if @instance.purgeable?
%p= t('admin.instances.purge_description_html')
= link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button button--destructive'