From 99076be1ba2e583450f78a7a0ec965c3034a3aab Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 10 Nov 2019 23:05:15 +0100 Subject: port tootsuite#12303 to monsterfork: Fix broken admin audit log in whitelist mode --- app/helpers/admin/action_logs_helper.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/helpers/admin') diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index c90818318..80fee2ded 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -44,6 +44,8 @@ module Admin::ActionLogsHelper 'flag' when 'DomainBlock' 'lock' + when 'DomainAllow' + 'plus-circle' when 'EmailDomainBlock' 'envelope' when 'Status' @@ -86,7 +88,7 @@ module Admin::ActionLogsHelper record.shortcode when 'Report' link_to "##{record.id}", admin_report_path(record) - when 'DomainBlock', 'EmailDomainBlock' + when 'DomainBlock', 'EmailDomainBlock', 'DomainAllow' link_to record.domain, admin_instance_path(id: record.domain) when 'Status' link_to record.account.acct, ActivityPub::TagManager.instance.url_for(record) @@ -99,7 +101,7 @@ module Admin::ActionLogsHelper case type when 'CustomEmoji' attributes['shortcode'] - when 'DomainBlock', 'EmailDomainBlock' + when 'DomainBlock', 'EmailDomainBlock', 'DomainAllow' link_to attributes['domain'], admin_instance_path(id: attributes['domain']) when 'Status' tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count')) -- cgit