diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-10 23:05:15 +0100 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:24:25 -0600 |
| commit | 99076be1ba2e583450f78a7a0ec965c3034a3aab (patch) | |
| tree | a108ad2c64f7d4f1ea2448af672dd1ef586e59f0 | |
| parent | e5bb8b27e96a3a803aa5b6eda783908e5d49c341 (diff) | |
port tootsuite#12303 to monsterfork: Fix broken admin audit log in whitelist mode
| -rw-r--r-- | app/helpers/admin/action_logs_helper.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 6 insertions, 2 deletions
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')) diff --git a/config/locales/en.yml b/config/locales/en.yml index 27d05800a..848f3395c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -219,10 +219,12 @@ en: create_account_warning: "%{name} sent a warning to %{target}" create_custom_emoji: "%{name} uploaded new emoji %{target}" create_domain_block: "%{name} added or changed policy for %{target}" + create_domain_allow: "%{name} whitelisted domain %{target}" create_email_domain_block: "%{name} blacklisted e-mail domain %{target}" demote_user: "%{name} demoted creature %{target}" destroy_custom_emoji: "%{name} destroyed emoji %{target}" destroy_domain_block: "%{name} reset policy for %{target}" + destroy_domain_allow: "%{name} removed domain %{target} from whitelist" destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}" destroy_status: "%{name} removed roar by %{target}" disable_2fa_user: "%{name} disabled two factor requirement for creature %{target}" |