From 828e56669890fe3326d6d579ba9cd2cd55eafa49 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 23 Jun 2023 11:26:53 +0400 Subject: [PATCH] changed logic to accomodate templates unique design --- .../shared/navigation/_breadcrumbs.html.erb | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/app/views/shared/navigation/_breadcrumbs.html.erb b/app/views/shared/navigation/_breadcrumbs.html.erb index 4624e867f..b5ac402b5 100644 --- a/app/views/shared/navigation/_breadcrumbs.html.erb +++ b/app/views/shared/navigation/_breadcrumbs.html.erb @@ -44,37 +44,42 @@ <%= last_item[:label] %> <% else %> + <% last_item = @breadcrumbs_items.pop %> <% template_paths = [/^\/protocols\/\d+$/, /^\/label_templates\/\d+$/] %> - <% if template_paths.any? { |pattern| request.path.match?(pattern) }%> - <% last_breadcrumb_items = @breadcrumbs_items.pop(2) %> + + <% if template_paths.any? { |pattern| request.path.match?(pattern) } || ["/protocols", "/label_templates"].include?(request.path) %> + + <%= @breadcrumbs_items.first[:label] %> + + + " + alt="navigate next" + class="navigate_next"> + + <% @breadcrumbs_items.each do |item| %> + <%= next if @breadcrumbs_items.first == item%> + <%= link_to(item[:label], item[:url], + class: "breadcrumbs-link", + title: item[:label]) %> + + " + alt="navigate next" + class="navigate_next"> + + <% end %> <% else %> - <% last_item = @breadcrumbs_items.pop %> + <% @breadcrumbs_items.each do |item| %> + <%= link_to(item[:label], item[:url], + class: "breadcrumbs-link", + title: item[:label]) %> + + " + alt="navigate next" + class="navigate_next"> + + <% end %> <% end %> - <% @breadcrumbs_items.each do |item| %> - <%= link_to(item[:label], item[:url], - class: "breadcrumbs-link", - title: item[:label]) %> - - " - alt="navigate next" - class="navigate_next"> - - <% end %> - - <% if last_breadcrumb_items %> - - <%= last_breadcrumb_items.first[:label] %> - - - " - alt="navigate next" - class="navigate_next"> - - - <%= last_breadcrumb_items.last[:label] %> - - <% end %> <% if last_item %> <%= last_item[:label] %>