From b587603092480c67298fd703523b1ccd0a0153a6 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <arnaud.levy@noesya.coop>
Date: Wed, 11 Dec 2024 11:32:08 +0100
Subject: [PATCH] Fix #2482 (#2493)
---
.../blocks/templates/call_to_action/_show.html.erb | 5 ++++-
.../blocks/templates/call_to_action/_snippet.html.erb | 5 ++++-
.../blocks/templates/call_to_action/_static.html.erb | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb
index 88eef955e..1d9665b02 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_show.html.erb
@@ -11,7 +11,10 @@ call_to_action_class += ' call_to_action--with-title' unless block.title.blank?
<%= render 'admin/communication/blocks/partials/top', block: block %>
<% if block.template.elements %>
<div class="actions" <% if block.template.elements.count > 1 %>role="group"<% end %>>
- <% block.template.elements.each do |element| %>
+ <%
+ block.template.elements.each do |element|
+ next if element.title.blank?
+ %>
<% if element.title %>
<a href="<%= block_component_show block, :url, template: element %>"
<% if element.target_blank %>
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_snippet.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_snippet.html.erb
index d8666c3fa..513af536f 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_snippet.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_snippet.html.erb
@@ -1,5 +1,8 @@
<div class="mb-1"><%= block_component_snippet block, :text %></div>
-<% block.template.elements.each_with_index do |element, index| %>
+<%
+block.template.elements.each_with_index do |element, index|
+ next if element.title.blank?
+ %>
<a class="btn disabled <%= index.zero? ? 'btn-dark' : 'btn-light' %>">
<%= block_component_snippet block, :title, template: element %>
</a>
diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_static.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_static.html.erb
index b760fc32a..338944e38 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_static.html.erb
@@ -4,9 +4,11 @@
<%= block_component_static block, :alt %>
<%= block_component_static block, :credit %>
buttons:
-<% block.template.elements.each do |element| %>
+<%
+block.template.elements.each do |element|
+ next if element.title.blank?
+ %>
<%= block_component_static block, :title, template: element, list: true, depth: 4 %>
<%= block_component_static block, :url, template: element, depth: 5 %>
<%= block_component_static block, :target_blank, template: element, depth: 5 %>
-
<% end %>
--
GitLab