diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-03-14 05:27:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 05:27:37 +0100 |
| commit | 5db1f377ea2735778d2d3004d2af268fdcafff4a (patch) | |
| tree | 3d96a607a1d19c6d8406872670a434fcb99ac3f8 | |
| parent | 74f406cfc97a8e9fcdfd6f040d2e6e6360b782f8 (diff) | |
Fix nil error when viewing suspended domain in admin UI (#17765)
| -rw-r--r-- | app/models/instance.rb | 6 | ||||
| -rw-r--r-- | app/views/admin/instances/show.html.haml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/instance.rb b/app/models/instance.rb index c01c23077..36110ee40 100644 --- a/app/models/instance.rb +++ b/app/models/instance.rb @@ -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? diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml index bed94f3fe..70912a4f5 100644 --- a/app/views/admin/instances/show.html.haml +++ b/app/views/admin/instances/show.html.haml @@ -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' |