From cb932a4c6ec9e3179d08ea2bb8256e77ca71e633 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 27 Jun 2022 12:39:03 +0200
Subject: [PATCH] description in key figures
---
.../communication/block/template/key_figure.rb | 1 +
.../blocks/templates/key_figures/_edit.html.erb | 12 ++++++++----
.../blocks/templates/key_figures/_preview.html.erb | 1 +
.../blocks/templates/key_figures/_static.html.erb | 1 +
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/models/communication/block/template/key_figure.rb b/app/models/communication/block/template/key_figure.rb
index a7baeb675..21b2cb6e5 100644
--- a/app/models/communication/block/template/key_figure.rb
+++ b/app/models/communication/block/template/key_figure.rb
@@ -1,5 +1,6 @@
class Communication::Block::Template::KeyFigure < Communication::Block::Template::Base
has_elements
+ has_component :description, :rich_text
end
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
index b40f32f6d..bb2013f55 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_edit.html.erb
@@ -1,4 +1,8 @@
-<% element = @block.template.default_element %>
+<div class="row">
+ <div class="col-xl-6">
+ <%= block_component_edit :description %>
+ </div>
+</div>
<%= block_component_add_element t('.add_key') %>
@@ -15,13 +19,13 @@
<div class="flex-fill">
<div class="row mb-n3">
<div class="col-lg-2">
- <%= block_component_edit :number, template: element %>
+ <%= block_component_edit :number, template: @element %>
</div>
<div class="col-lg-3">
- <%= block_component_edit :unit, template: element %>
+ <%= block_component_edit :unit, template: @element %>
</div>
<div class="col-lg-7">
- <%= block_component_edit :description, template: element, rows: 1 %>
+ <%= block_component_edit :description, template: @element, rows: 1 %>
</div>
</div>
</div>
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
index 8f57eb142..6a35281aa 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
@@ -1,3 +1,4 @@
+<%= block_component_preview :description %>
<% @block.template.elements.each do |element| %>
<p class="lead mb-0">
<b>
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_static.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_static.html.erb
index 6d16ea88e..dc4978617 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_static.html.erb
@@ -1,3 +1,4 @@
+<%= block_component_static :description %>
figures:
<% block.template.elements.each do |element| %>
- <%= block_component_static :number, template: element, depth: 0 %>
--
GitLab