Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856)
This commit is contained in:
parent
3d0a6ba831
commit
56ecdde152
10
app/helpers/admin/content_policies_helper.rb
Normal file
10
app/helpers/admin/content_policies_helper.rb
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Admin::ContentPoliciesHelper
|
||||||
|
def policy_list(domain_block)
|
||||||
|
domain_block
|
||||||
|
.policies
|
||||||
|
.map { |policy| I18n.t("admin.instances.content_policies.policies.#{policy}") }
|
||||||
|
.join(' · ')
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
%br/
|
%br/
|
||||||
|
|
||||||
= f.object.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
|
= policy_list(f.object)
|
||||||
- if f.object.public_comment.present?
|
- if f.object.public_comment.present?
|
||||||
·
|
·
|
||||||
= f.object.public_comment
|
= f.object.public_comment
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
%small
|
%small
|
||||||
- if instance.domain_block
|
- if instance.domain_block
|
||||||
= instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
|
= policy_list(instance.domain_block)
|
||||||
- if instance.domain_block.public_comment.present?
|
- if instance.domain_block.public_comment.present?
|
||||||
%span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
|
%span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
|
||||||
- if instance.domain_block.private_comment.present?
|
- if instance.domain_block.private_comment.present?
|
||||||
|
|||||||
@ -37,7 +37,7 @@
|
|||||||
%td= @instance.domain_block.public_comment
|
%td= @instance.domain_block.public_comment
|
||||||
%tr
|
%tr
|
||||||
%th= t('admin.instances.content_policies.policy')
|
%th= t('admin.instances.content_policies.policy')
|
||||||
%td= @instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
|
%td= policy_list(@instance.domain_block)
|
||||||
|
|
||||||
= link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
|
= link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
|
||||||
= link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
|
= link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
|
||||||
|
|||||||
21
spec/helpers/admin/content_policies_helper_spec.rb
Normal file
21
spec/helpers/admin/content_policies_helper_spec.rb
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Admin::ContentPoliciesHelper do
|
||||||
|
describe '#policy_list' do
|
||||||
|
subject { helper.policy_list(domain_block) }
|
||||||
|
|
||||||
|
context 'when severity is suspend' do
|
||||||
|
let(:domain_block) { Fabricate.build :domain_block, severity: :suspend }
|
||||||
|
|
||||||
|
it { is_expected.to eq('Suspend') }
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when severity is silence' do
|
||||||
|
let(:domain_block) { Fabricate.build :domain_block, severity: :silence, reject_reports: true }
|
||||||
|
|
||||||
|
it { is_expected.to eq('Limit · Reject reports') }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
x
Reference in New Issue
Block a user