From 15d8c1da12f755fbb5198c758fc68c1d65e462ad Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 17 Dec 2014 15:30:50 +0100 Subject: [PATCH] SONAR-5952 Update the issue permalink in the notification email --- .../core/issue/notification/IssueChangesEmailTemplate.java | 6 ++---- .../display_component_key_if_no_component_name.txt | 2 +- .../email_with_action_plan_change.txt | 2 +- .../email_with_assignee_change.txt | 2 +- .../email_with_multiple_changes.txt | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java index 9a342524d2f..7f008ba3cca 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java @@ -81,7 +81,7 @@ public class IssueChangesEmailTemplate extends EmailTemplate { appendField(sb, "Status", notif.getFieldValue("old.status"), notif.getFieldValue("new.status")); appendField(sb, "Message", notif.getFieldValue("old.message"), notif.getFieldValue("new.message")); appendField(sb, "Author", notif.getFieldValue("old.author"), notif.getFieldValue("new.author")); - appendFieldWithoutHistory(sb, "Action Plan", notif.getFieldValue("old.actionPlan"), notif.getFieldValue("new.actionPlan")) ; + appendFieldWithoutHistory(sb, "Action Plan", notif.getFieldValue("old.actionPlan"), notif.getFieldValue("new.actionPlan")); } private void appendHeader(Notification notif, StringBuilder sb) { @@ -92,9 +92,7 @@ public class IssueChangesEmailTemplate extends EmailTemplate { private void appendFooter(StringBuilder sb, Notification notification) { String issueKey = notification.getFieldValue("key"); - String componentKey = notification.getFieldValue("componentKey"); - sb.append("See it in SonarQube: ").append(settings.getServerBaseURL()).append("/component/index#component=").append(componentKey) - .append("¤tIssue=").append(issueKey).append(NEW_LINE); + sb.append("See it in SonarQube: ").append(settings.getServerBaseURL()).append("/issues/search#issues=").append(issueKey).append(NEW_LINE); } private void appendLine(StringBuilder sb, @Nullable String line) { diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt index 74e3c716b78..9f90a7d06ab 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt @@ -3,4 +3,4 @@ Rule: Avoid Cycles Message: Has 3 cycles -See it in SonarQube: http://nemo.sonarsource.org/component/index#component=org.apache.struts.Action¤tIssue=ABCDE +See it in SonarQube: http://nemo.sonarsource.org/issues/search#issues=ABCDE diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt index 1fc46b2e8f7..f9a4356907a 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt @@ -4,4 +4,4 @@ Message: Has 3 cycles Action Plan changed to ABC 1.0 -See it in SonarQube: http://nemo.sonarsource.org/component/index#component=org.apache.struts.Action¤tIssue=ABCDE +See it in SonarQube: http://nemo.sonarsource.org/issues/search#issues=ABCDE diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt index aec09dd4b52..fd4c140e55e 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt @@ -4,4 +4,4 @@ Message: Has 3 cycles Assignee changed to louis -See it in SonarQube: http://nemo.sonarsource.org/component/index#component=org.apache.struts.Action¤tIssue=ABCDE +See it in SonarQube: http://nemo.sonarsource.org/issues/search#issues=ABCDE diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt index 6bee33751fd..6462b448895 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt @@ -7,4 +7,4 @@ Assignee changed to louis Resolution: FALSE-POSITIVE Status: RESOLVED -See it in SonarQube: http://nemo.sonarsource.org/component/index#component=org.apache.struts.Action¤tIssue=ABCDE +See it in SonarQube: http://nemo.sonarsource.org/issues/search#issues=ABCDE -- 2.39.5