From 8b9b8d8c67c6f043bdd5048a8717c7c25faf500e Mon Sep 17 00:00:00 2001
From: "Kenneth Rioja (cir6)" <59597207+kennethrioja@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:25:29 +0200
Subject: [PATCH 1/3] Update workflows.html.erb
---
app/views/layouts/workflows.html.erb | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app/views/layouts/workflows.html.erb b/app/views/layouts/workflows.html.erb
index 42b2b5dab..49c15a7ae 100644
--- a/app/views/layouts/workflows.html.erb
+++ b/app/views/layouts/workflows.html.erb
@@ -7,10 +7,6 @@
<%= render :partial=>"layouts/header" %>
-
- <%= flash_messages %>
-
-
<%= render 'common/breadcrumbs' if @breadcrumbs %>
From 4700792f5c673e23b0e5963075b26b48a219417d Mon Sep 17 00:00:00 2001
From: "Kenneth Rioja (cir6)" <59597207+kennethrioja@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:46:46 +0200
Subject: [PATCH 2/3] Update workflows.html.erb
---
app/views/layouts/workflows.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/layouts/workflows.html.erb b/app/views/layouts/workflows.html.erb
index 49c15a7ae..a25072f8c 100644
--- a/app/views/layouts/workflows.html.erb
+++ b/app/views/layouts/workflows.html.erb
@@ -3,7 +3,7 @@
<%= render 'layouts/head' %>
-
+ <%= 'header-notice-present' if TeSS::Config.header_notice&.strip.present? %>>
<%= render :partial=>"layouts/header" %>
From fd86d09f338ffabae95a2494de723bc724e2debd Mon Sep 17 00:00:00 2001
From: kennethrioja <59597207+kennethrioja@users.noreply.github.com>
Date: Tue, 12 Aug 2025 09:46:32 +0200
Subject: [PATCH 3/3] remove(skip_flash_messages_in_header): not used anymore
---
app/controllers/workflows_controller.rb | 1 -
app/views/layouts/_header.html.erb | 8 +++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 9b0d6d383..b2b306558 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -24,7 +24,6 @@ def index
# GET /workflows/1.json
def show
authorize @workflow
- @skip_flash_messages_in_header = true # we will handle flash messages in the 'workflows' layout
respond_to do |format|
format.html { render layout: 'workflows' }
format.json
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index c4acc9572..b6c8defe3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -93,11 +93,9 @@
<% end %>
- <% if !defined? @skip_flash_messages_in_header or !@skip_flash_messages_in_header %>
-
- <%= flash_messages %>
-
- <% end %>
+
+ <%= flash_messages %>
+
<%= render(partial: 'layouts/cookie_banner') if cookie_consent.show_banner? %>