diff --git a/app/models/concerns/with_blocks.rb b/app/models/concerns/with_blocks.rb index ecb199091e78f4a5c46c2dbe8056510d71f1b949..13778ae89d02bd85ed6ac86e03bb6fd9db45457c 100644 --- a/app/models/concerns/with_blocks.rb +++ b/app/models/concerns/with_blocks.rb @@ -6,17 +6,17 @@ module WithBlocks has_many :headings, as: :about, class_name: 'Communication::Block::Heading', dependent: :destroy end - def content - unless @content - @content = [] + def contents + unless @contents + @contents = [] blocks.without_heading.published.ordered.each do |block| - @content << block + @contents << block end headings.ordered.each do |heading| - @content << heading + @contents << heading end end - @content + @contents end # Basic rule is: TOC if 2 titles or more diff --git a/app/views/admin/communication/blocks/content/_static.json.jbuilder b/app/views/admin/communication/blocks/content/_static.json.jbuilder index d1e0f8b841c8164910a2df589f6fa0363288e835..33c49fb9a21cb801cab0169a81a56dfccf411939 100644 --- a/app/views/admin/communication/blocks/content/_static.json.jbuilder +++ b/app/views/admin/communication/blocks/content/_static.json.jbuilder @@ -1,4 +1,4 @@ -json.contents about.content do |block_or_heading| +json.contents about.contents do |block_or_heading| if block_or_heading.is_a? Communication::Block json.partial! 'admin/communication/blocks/static', block: block_or_heading else