From cfc7e53574adf090c4f78f181c637074e0e99bc1 Mon Sep 17 00:00:00 2001 From: mellowmarsach Date: Tue, 5 May 2026 20:07:23 +0800 Subject: [PATCH 1/3] A03-7394 - If tag name is in error state, display old name instead --- app/helpers/tags_helper.rb | 5 +++-- features/tags_and_wrangling/tag_wrangling_special.feature | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 9b9ac87b7cd..0a62d811446 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -52,9 +52,10 @@ def wrangler_list(wranglers, tag) end def link_to_tag(tag, options = {}) - link_to_tag_with_text(tag, tag.display_name, options) + display_name = tag.errors.has_key?(:name) ? tag.name_was : tag.display_name + link_to_tag_with_text(tag, display_name, options) end - + def link_to_tag_works(tag, options = {}) link_to_tag_works_with_text(tag, tag.display_name, options) end diff --git a/features/tags_and_wrangling/tag_wrangling_special.feature b/features/tags_and_wrangling/tag_wrangling_special.feature index 99ce3e1e7c2..5ffc0e3c3f6 100644 --- a/features/tags_and_wrangling/tag_wrangling_special.feature +++ b/features/tags_and_wrangling/tag_wrangling_special.feature @@ -39,6 +39,7 @@ Feature: Tag Wrangling - special cases When I fill in "Name" with "Amelia" And I press "Save changes" Then I should see "Name can only be changed by an admin." + And I should see "Edit Amelie Tag" Scenario: Change capitalisation of a tag From a51b516c79f71492ea6168586087c9949cd1a4ca Mon Sep 17 00:00:00 2001 From: mellowmarsach Date: Tue, 5 May 2026 20:32:04 +0800 Subject: [PATCH 2/3] A03-7394 Cleanup --- app/helpers/tags_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 0a62d811446..263595f7868 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -55,7 +55,7 @@ def link_to_tag(tag, options = {}) display_name = tag.errors.has_key?(:name) ? tag.name_was : tag.display_name link_to_tag_with_text(tag, display_name, options) end - + def link_to_tag_works(tag, options = {}) link_to_tag_works_with_text(tag, tag.display_name, options) end From 40c94ea2630bb7b65b2ae4af9fb5f836388deb27 Mon Sep 17 00:00:00 2001 From: mellowmarsach Date: Tue, 5 May 2026 20:40:06 +0800 Subject: [PATCH 3/3] AO3-7394 Rubocop --- app/helpers/tags_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 263595f7868..db9a0e39b14 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -52,7 +52,7 @@ def wrangler_list(wranglers, tag) end def link_to_tag(tag, options = {}) - display_name = tag.errors.has_key?(:name) ? tag.name_was : tag.display_name + display_name = tag.errors.key?(:name) ? tag.name_was : tag.display_name link_to_tag_with_text(tag, display_name, options) end