Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit cb6f5fb

Browse files
committed
Merge pull request #69 from tomaslin/use-details-view
change links to point to the single execution screen
2 parents 03c7ce1 + a2abbf8 commit cb6f5fb

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgent.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ abstract class AbstractEventNotificationAgent implements EchoEventListener {
3333
static Map CONFIG = [
3434
'pipeline': [
3535
type: 'pipeline',
36-
link: 'executions'
36+
link: 'executions/details'
3737
],
3838
'task' : [
3939
type: 'task',

echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/HipchatNotificationAgent.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class HipchatNotificationAgent extends AbstractEventNotificationAgent {
7878
"""${WordUtils.capitalize(application)}'s <a href="${
7979
spinnakerUrl
8080
}/#/applications/${application}/${
81-
config.type == 'stage' ? 'executions' : config.link
81+
config.type == 'stage' ? 'executions/details' : config.link
8282
}/${event.content?.execution?.id}">${
8383
event.content?.execution?.name ?: event.content?.execution?.description
8484
}</a> ${buildInfo} ${config.type == 'task' ? 'task' : 'pipeline'} ${status == 'starting' ? 'is' : 'has'} ${

echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgent.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class SlackNotificationAgent extends AbstractEventNotificationAgent {
6767
"""${WordUtils.capitalize(application)}'s <${
6868
spinnakerUrl
6969
}/#/applications/${application}/${
70-
config.type == 'stage' ? 'executions' : config.link
70+
config.type == 'stage' ? 'executions/details' : config.link
7171
}/${event.content?.execution?.id}|${
7272
event.content?.execution?.name ?: event.content?.execution?.description
7373
}> ${buildInfo} ${config.type == 'task' ? 'task' : 'pipeline'} ${status == 'starting' ? 'is' : 'has'} ${

echo-notifications/src/main/groovy/com/netflix/spinnaker/echo/notification/TwilioNotificationAgent.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TwilioNotificationAgent extends AbstractEventNotificationAgent {
4343
void sendNotifications(Map preference, String application, Event event, Map config, String status) {
4444
try {
4545
String name = event.content?.execution?.name ?: event.content?.execution?.description
46-
String link = "${spinnakerUrl}/#/applications/${application}/${config.type == 'stage' ? 'executions' : config.link}/${event.content?.execution?.id}"
46+
String link = "${spinnakerUrl}/#/applications/${application}/${config.type == 'stage' ? 'executions/details' : config.link}/${event.content?.execution?.id}"
4747

4848
String buildInfo = ''
4949

echo-notifications/src/main/resources/templates/manualJudgment/body-email.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ $htmlToText.convert($notification.additionalContext.instructions)
44
#end
55
For more details, please visit:
66

7-
$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
7+
$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId

echo-notifications/src/main/resources/templates/manualJudgment/body-hipchat.vm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ $notification.additionalContext.instructions
77
#end
88
For more details, please visit:
99
<br/><br/>
10-
<a href="$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId">
11-
$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
10+
<a href="$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId">
11+
$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId
1212
</a>

echo-notifications/src/main/resources/templates/manualJudgment/body.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ $htmlToText.convert($notification.additionalContext.instructions)
77

88
For more details, please visit:
99

10-
$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
10+
$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
To see more details, please visit:
22

3-
$url/#/applications/$application/executions/$executionId
3+
$url/#/applications/$application/executions/details/$executionId

0 commit comments

Comments
 (0)