Skip to content

flash-container duplicate in workflows.html.erb (small fix) #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fbacall merged 3 commits into from
Aug 27, 2025
Merged

flash-container duplicate in workflows.html.erb (small fix) #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b9b8d8
Update workflows.html.erb
kennethrioja Jul 28, 2025
4700792
Update workflows.html.erb
kennethrioja Jul 28, 2025
fd86d09
remove(skip_flash_messages_in_header): not used anymore
kennethrioja Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/controllers/workflows_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions app/views/layouts/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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? %>
6 changes: 1 addition & 5 deletions app/views/layouts/workflows.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>

Expand Down
Loading