From 7d7ea5eae3badcd07a490eccccdf1b37c15687dd Mon Sep 17 00:00:00 2001 From: Sue Zhou Date: Sun, 23 Mar 2025 14:33:41 +0000 Subject: [PATCH 1/2] fix link with icon button style --- CHANGELOG.md | 2 +- app/helpers/ndr_error/errors_helper.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7abacc5..2d5b924 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## [Unreleased] -* no unreleased changes +* fix link with icon button style ## 2.4.1 / 2025-02-03 ### Fixed diff --git a/app/helpers/ndr_error/errors_helper.rb b/app/helpers/ndr_error/errors_helper.rb index 2b6a100..66de8a9 100644 --- a/app/helpers/ndr_error/errors_helper.rb +++ b/app/helpers/ndr_error/errors_helper.rb @@ -57,7 +57,7 @@ def downstream_fingerprint_link(print) end def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/OptionalBooleanParameter - text = "#{bootstrap_icon_tag('asterisk', :bi)} View ticket" + text = bootstrap_icon_tag('asterisk', :bi) + ' View ticket' css = 'btn btn-outline-secondary' css << ' btn-xs' if small @@ -67,14 +67,14 @@ def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/Optional def edit_button_for(fingerprint) css = 'btn btn-outline-secondary' - text = "#{bootstrap_icon_tag('pencil', :bi)} Edit Ticket" + text = bootstrap_icon_tag('pencil', :bi) + ' Edit Ticket' link_to(text, edit_error_fingerprint_path(fingerprint), class: css) end def purge_button_for(fingerprint) css = 'btn btn-danger' - text = "#{bootstrap_icon_tag('trash-fill', :bi)} Purge" + text = bootstrap_icon_tag('trash-fill', :bi) + ' Purge' options = { 'method' => :delete, From f968e83350a73d8f2a8492d347227e5f14dd5c95 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Sun, 23 Mar 2025 15:45:57 +0000 Subject: [PATCH 2/2] rubocop fixes --- app/helpers/ndr_error/errors_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/ndr_error/errors_helper.rb b/app/helpers/ndr_error/errors_helper.rb index 66de8a9..79ded8a 100644 --- a/app/helpers/ndr_error/errors_helper.rb +++ b/app/helpers/ndr_error/errors_helper.rb @@ -57,7 +57,7 @@ def downstream_fingerprint_link(print) end def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/OptionalBooleanParameter - text = bootstrap_icon_tag('asterisk', :bi) + ' View ticket' + text = bootstrap_icon_tag('asterisk', :bi) + ' View ticket' # rubocop:disable Style/StringConcatenation css = 'btn btn-outline-secondary' css << ' btn-xs' if small @@ -67,14 +67,14 @@ def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/Optional def edit_button_for(fingerprint) css = 'btn btn-outline-secondary' - text = bootstrap_icon_tag('pencil', :bi) + ' Edit Ticket' + text = bootstrap_icon_tag('pencil', :bi) + ' Edit Ticket' # rubocop:disable Style/StringConcatenation link_to(text, edit_error_fingerprint_path(fingerprint), class: css) end def purge_button_for(fingerprint) css = 'btn btn-danger' - text = bootstrap_icon_tag('trash-fill', :bi) + ' Purge' + text = bootstrap_icon_tag('trash-fill', :bi) + ' Purge' # rubocop:disable Style/StringConcatenation options = { 'method' => :delete,