Fix broken admin audit log in whitelist mode (#12303)
This commit is contained in:
		
							parent
							
								
									0d6da8892a
								
							
						
					
					
						commit
						a2014830c2
					
				
					 2 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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', 'DomainAllow', 'EmailDomainBlock'
 | 
			
		||||
      link_to record.domain, "https://#{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', 'DomainAllow', 'EmailDomainBlock'
 | 
			
		||||
      link_to attributes['domain'], "https://#{attributes['domain']}"
 | 
			
		||||
    when 'Status'
 | 
			
		||||
      tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count'))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -203,10 +203,12 @@ en:
 | 
			
		|||
        confirm_user: "%{name} confirmed e-mail address of user %{target}"
 | 
			
		||||
        create_account_warning: "%{name} sent a warning to %{target}"
 | 
			
		||||
        create_custom_emoji: "%{name} uploaded new emoji %{target}"
 | 
			
		||||
        create_domain_allow: "%{name} whitelisted domain %{target}"
 | 
			
		||||
        create_domain_block: "%{name} blocked domain %{target}"
 | 
			
		||||
        create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
 | 
			
		||||
        demote_user: "%{name} demoted user %{target}"
 | 
			
		||||
        destroy_custom_emoji: "%{name} destroyed emoji %{target}"
 | 
			
		||||
        destroy_domain_allow: "%{name} removed domain %{target} from whitelist"
 | 
			
		||||
        destroy_domain_block: "%{name} unblocked domain %{target}"
 | 
			
		||||
        destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
 | 
			
		||||
        destroy_status: "%{name} removed status by %{target}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue