Merge pull request #1131 from kennethrioja/patch-2

fbacall · web-flow · commit 2937ba2de806 · 2025-08-27T12:33:08.000+01:00
`flash-container` duplicate in workflows.html.erb (small fix)
diff --git 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
@@ -93,11 +93,9 @@
     </div>
   <% end %>
 
-  <% if !defined? @skip_flash_messages_in_header or !@skip_flash_messages_in_header %>
-    <div id="flash-container" class="container-fluid">
-      <%= flash_messages %>
-    </div>
-  <% end %>
+  <div id="flash-container" class="container-fluid">
+    <%= flash_messages %>
+  </div>
 </header>
 
 <%= render(partial: 'layouts/cookie_banner') if cookie_consent.show_banner? %>
diff --git a/app/views/layouts/workflows.html.erb b/app/views/layouts/workflows.html.erb
@@ -3,14 +3,10 @@
 
 <%= render 'layouts/head' %>
 
-<body>
+<body class=<%= 'sticky-navbar-enabled' if TeSS::Config.feature['sticky_navbar'] %> <%= 'header-notice-present' if TeSS::Config.header_notice&.strip.present? %>>
 
 <%= render :partial=>"layouts/header" %>
 
-<div id="flash-container" class="workflows-container" style="margin-top: 5px">
-  <%= flash_messages %>
-</div>
-
 <div id="main-container" class="workflows-container">
   <%= render 'common/breadcrumbs' if @breadcrumbs %>
 
