From aa40a964f90a4c575bd5adffbbc2b80946e87992 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 6 May 2022 11:20:23 +0200
Subject: [PATCH] fix
---
app/models/communication/block/template/page.rb | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/app/models/communication/block/template/page.rb b/app/models/communication/block/template/page.rb
index fd6d8079b..dd60b571e 100644
--- a/app/models/communication/block/template/page.rb
+++ b/app/models/communication/block/template/page.rb
@@ -1,6 +1,6 @@
class Communication::Block::Template::Page < Communication::Block::Template
def build_git_dependencies
- add_dependency main_page.page
+ add_dependency main_page
selected_pages.each do |hash|
page = hash.page
add_dependency page
@@ -9,7 +9,11 @@ class Communication::Block::Template::Page < Communication::Block::Template
end
def selected_pages
- @selected_pages ||= free_pages
+ @selected_pages ||= elements.map { |element|
+ p = page(element['id'])
+ next if p.nil?
+ hash_from_page(p, element)
+ }.compact
end
def main_page
@@ -26,14 +30,6 @@ class Communication::Block::Template::Page < Communication::Block::Template
protected
- def free_pages
- elements.map { |element|
- p = page(element['id'])
- next if p.nil?
- hash_from_page(p, element)
- }.compact
- end
-
def hash_from_page(page, element)
{
page: page,
--
GitLab