From 5dfd882136a807d9b8975f09043613c393bd4050 Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Tue, 19 Apr 2022 17:39:29 +0200
Subject: [PATCH] Admin show : wip
---
app/models/communication/block/template/page.rb | 8 +-------
.../blocks/templates/pages/_show.html.erb | 12 ++++++------
.../blocks/templates/pages/_static.html.erb | 8 ++++----
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/app/models/communication/block/template/page.rb b/app/models/communication/block/template/page.rb
index 340a978a5..45bac3ce0 100644
--- a/app/models/communication/block/template/page.rb
+++ b/app/models/communication/block/template/page.rb
@@ -32,7 +32,7 @@ class Communication::Block::Template::Page < Communication::Block::Template
def free_pages
elements.map { |element|
{
- slug: page_slug(element['id']),
+ page: page(element['id']),
show_description: element['show_description'] || false,
show_image: element['show_image'] || false
}.to_dot
@@ -44,10 +44,4 @@ class Communication::Block::Template::Page < Communication::Block::Template
return if id.blank?
page = block.about&.website.pages.find_by id: id
end
-
- def page_slug(id)
- page = page(id)
- return if page.blank?
- return page.slug
- end
end
diff --git a/app/views/admin/communication/blocks/templates/pages/_show.html.erb b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
index 06a38ef4d..c69c585bd 100644
--- a/app/views/admin/communication/blocks/templates/pages/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_show.html.erb
@@ -1,17 +1,17 @@
<% if @block.data %>
- <% if @block.template.category %>
- <h2 class="mb-4"><%= @block.template.category %></h2>
+ <% if @block.template.main_page %>
+ <h2 class="mb-4"><%= @block.template.main_page.slug %></h2>
<% end %>
- <% if @block.template.selected_posts.any? %>
+ <% if @block.template.selected_pages.any? %>
<div class="row">
- <% @block.template.selected_posts.each do |post| %>
+ <% @block.template.selected_pages.each do |page| %>
<div class="col-md-4">
<div class="card">
<div class="card-header">
- <h3 class="card-title h5"><%= post %></h3>
+ <h3 class="card-title h5"><%= page %></h3>
</div>
<div class="card-body">
- <%= post.description_short %>
+ <%= page.description_short %>
</div>
</div>
</div>
diff --git a/app/views/admin/communication/blocks/templates/pages/_static.html.erb b/app/views/admin/communication/blocks/templates/pages/_static.html.erb
index 3352ceb94..f7ec27aa2 100644
--- a/app/views/admin/communication/blocks/templates/pages/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_static.html.erb
@@ -3,8 +3,8 @@
show_description: <%= block.template.show_description %>
<% end %>
pages:
-<% block.template.selected_pages.each do |page| %>
- - slug: <%= page.slug %>
- show_description: <%= page.show_description %>
- show_image: <%= page.show_image %>
+<% block.template.selected_pages.each do |element| %>
+ - slug: <%= element.page.slug %>
+ show_description: <%= element.show_description %>
+ show_image: <%= element.show_image %>
<% end %>
--
GitLab