From 3f21ea232990740f266ddeae0c41884ee4a1e018 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 20 Nov 2025 21:12:41 +0100 Subject: [PATCH 1/5] Revert "Revert "Add more detail to events summaries"" --- app/helpers/notifications_helper.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 029c328bb..6be46ef76 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -10,11 +10,18 @@ module NotificationsHelper name = event.creator.name case event_notification_action(event) - when "card_closed" then "Moved to Done by #{name}" - when "card_reopened" then "Reopened by #{name}" - when "card_published" then "Added by #{name}" - when "comment_created" then comment_notification_body(event) when "card_assigned" then "Assigned to #{event.assignees.none? ? "self" : event.assignees.pluck(:name).to_sentence}" + when "card_unassigned" then "Unassigned by #{name}" + when "card_published" then "Added by #{name}" + when "card_closed" then %(Moved to "Done" by #{name}) + when "card_reopened" then "Reopened by #{name}" + when "card_postponed" then %(Moved to "Not Now" by #{name}) + when "card_auto_postponed" then %(Closed as "Not Now" due to inactivity) + when "card_title_changed" then "Renamed by #{name}" + when "card_board_changed" then "Moved by #{name}" + when "card_triaged" then "Triaged by #{name}" + when "card_sent_back_to_triage" then %(Moved back to "Maybe?" by #{name}) + when "comment_created" then comment_notification_body(event) else name end end From baadd484b49a6d3358cf3b71407b18933359c089 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 20 Nov 2025 21:28:41 +0100 Subject: [PATCH 2/5] Review triage --- app/helpers/notifications_helper.rb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 6be46ef76..9e5a12869 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -7,22 +7,23 @@ module NotificationsHelper end def event_notification_body(event) - name = event.creator.name + creator = event.creator.name case event_notification_action(event) when "card_assigned" then "Assigned to #{event.assignees.none? ? "self" : event.assignees.pluck(:name).to_sentence}" - when "card_unassigned" then "Unassigned by #{name}" - when "card_published" then "Added by #{name}" - when "card_closed" then %(Moved to "Done" by #{name}) - when "card_reopened" then "Reopened by #{name}" - when "card_postponed" then %(Moved to "Not Now" by #{name}) + when "card_unassigned" then "Unassigned by #{creator}" + when "card_published" then "Added by #{creator}" + when "card_closed" then %(Moved to "Done" by #{creator}) + when "card_reopened" then "Reopened by #{creator}" + when "card_postponed" then %(Moved to "Not Now" by #{creator}) when "card_auto_postponed" then %(Closed as "Not Now" due to inactivity) - when "card_title_changed" then "Renamed by #{name}" - when "card_board_changed" then "Moved by #{name}" - when "card_triaged" then "Triaged by #{name}" - when "card_sent_back_to_triage" then %(Moved back to "Maybe?" by #{name}) + when "card_title_changed" then "Renamed by #{creator}" + when "card_board_changed" then "Moved by #{creator}" + when "card_triaged" + %(Moved to "#{event.particulars.dig("particulars", "column")}" by #{creator}) + when "card_sent_back_to_triage" then %(Moved back to "Maybe?" by #{creator}) when "comment_created" then comment_notification_body(event) - else name + else creator end end From a5b58e47fe16fa49da2032be8c5c3401108ec69b Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 20 Nov 2025 21:32:43 +0100 Subject: [PATCH 3/5] Remove unclosed span --- app/views/notifications/notification/event/_body.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/notifications/notification/event/_body.html.erb b/app/views/notifications/notification/event/_body.html.erb index 25235372f..79f9c7fa2 100644 --- a/app/views/notifications/notification/event/_body.html.erb +++ b/app/views/notifications/notification/event/_body.html.erb @@ -5,5 +5,5 @@
- <%= event_notification_body(event) %> + <%= event_notification_body(event) %>
From c052839bd6261702b499a3f23a96bbcba73f0c54 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 20 Nov 2025 21:37:41 +0100 Subject: [PATCH 4/5] Removed quotes since we were not using them --- app/helpers/notifications_helper.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 9e5a12869..e7731127b 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -13,15 +13,14 @@ module NotificationsHelper when "card_assigned" then "Assigned to #{event.assignees.none? ? "self" : event.assignees.pluck(:name).to_sentence}" when "card_unassigned" then "Unassigned by #{creator}" when "card_published" then "Added by #{creator}" - when "card_closed" then %(Moved to "Done" by #{creator}) + when "card_closed" then "Moved to Done by #{creator}" when "card_reopened" then "Reopened by #{creator}" - when "card_postponed" then %(Moved to "Not Now" by #{creator}) - when "card_auto_postponed" then %(Closed as "Not Now" due to inactivity) + when "card_postponed" then "Moved to Not Now by #{creator}" + when "card_auto_postponed" then "Closed as Not Now due to inactivity" when "card_title_changed" then "Renamed by #{creator}" when "card_board_changed" then "Moved by #{creator}" - when "card_triaged" - %(Moved to "#{event.particulars.dig("particulars", "column")}" by #{creator}) - when "card_sent_back_to_triage" then %(Moved back to "Maybe?" by #{creator}) + when "card_triaged" then "Moved to #{event.particulars.dig("particulars", "column")} by #{creator}" + when "card_sent_back_to_triage" then "Moved back to Maybe? by #{creator}" when "comment_created" then comment_notification_body(event) else creator end From ad7eb594d3c9b581f1b075fd3044865c4f833640 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 21:31:40 -0600 Subject: [PATCH 5/5] Match copy coming in #1663 --- app/helpers/notifications_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index e7731127b..355f60550 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -16,7 +16,7 @@ module NotificationsHelper when "card_closed" then "Moved to Done by #{creator}" when "card_reopened" then "Reopened by #{creator}" when "card_postponed" then "Moved to Not Now by #{creator}" - when "card_auto_postponed" then "Closed as Not Now due to inactivity" + when "card_auto_postponed" then "Moved to Not Now due to inactivity" when "card_title_changed" then "Renamed by #{creator}" when "card_board_changed" then "Moved by #{creator}" when "card_triaged" then "Moved to #{event.particulars.dig("particulars", "column")} by #{creator}"