change links to point to the single execution screen

spinnaker · Feb 24, 2016 · a2abbf8 · a2abbf8
1 parent 03c7ce1
commit a2abbf8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/...main/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgent.groovy b/...main/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgent.groovy
@@ -33,7 +33,7 @@ abstract class AbstractEventNotificationAgent implements EchoEventListener {
   static Map CONFIG = [
     'pipeline': [
       type: 'pipeline',
-      link: 'executions'
+      link: 'executions/details'
     ],
     'task'    : [
       type: 'task',

diff --git a/...s/src/main/groovy/com/netflix/spinnaker/echo/notification/HipchatNotificationAgent.groovy b/...s/src/main/groovy/com/netflix/spinnaker/echo/notification/HipchatNotificationAgent.groovy
@@ -78,7 +78,7 @@ class HipchatNotificationAgent extends AbstractEventNotificationAgent {
         """${WordUtils.capitalize(application)}'s <a href="${
           spinnakerUrl
         }/#/applications/${application}/${
-          config.type == 'stage' ? 'executions' : config.link
+          config.type == 'stage' ? 'executions/details' : config.link
         }/${event.content?.execution?.id}">${
           event.content?.execution?.name ?: event.content?.execution?.description
         }</a> ${buildInfo} ${config.type == 'task' ? 'task' : 'pipeline'} ${status == 'starting' ? 'is' : 'has'} ${

diff --git a/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgent.groovy b/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgent.groovy
@@ -67,7 +67,7 @@ class SlackNotificationAgent extends AbstractEventNotificationAgent {
         """${WordUtils.capitalize(application)}'s <${
           spinnakerUrl
         }/#/applications/${application}/${
-          config.type == 'stage' ? 'executions' : config.link
+          config.type == 'stage' ? 'executions/details' : config.link
         }/${event.content?.execution?.id}|${
           event.content?.execution?.name ?: event.content?.execution?.description
         }> ${buildInfo} ${config.type == 'task' ? 'task' : 'pipeline'} ${status == 'starting' ? 'is' : 'has'} ${

diff --git a/...ns/src/main/groovy/com/netflix/spinnaker/echo/notification/TwilioNotificationAgent.groovy b/...ns/src/main/groovy/com/netflix/spinnaker/echo/notification/TwilioNotificationAgent.groovy
@@ -43,7 +43,7 @@ class TwilioNotificationAgent extends AbstractEventNotificationAgent {
   void sendNotifications(Map preference, String application, Event event, Map config, String status) {
     try {
       String name = event.content?.execution?.name ?: event.content?.execution?.description
-      String link = "${spinnakerUrl}/#/applications/${application}/${config.type == 'stage' ? 'executions' : config.link}/${event.content?.execution?.id}"
+      String link = "${spinnakerUrl}/#/applications/${application}/${config.type == 'stage' ? 'executions/details' : config.link}/${event.content?.execution?.id}"
 
       String buildInfo = ''
 

diff --git a/echo-notifications/src/main/resources/templates/manualJudgment/body-email.vm b/echo-notifications/src/main/resources/templates/manualJudgment/body-email.vm
@@ -4,4 +4,4 @@ $htmlToText.convert($notification.additionalContext.instructions)
 #end
 For more details, please visit:
 
-$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
+$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId
diff --git a/echo-notifications/src/main/resources/templates/manualJudgment/body-hipchat.vm b/echo-notifications/src/main/resources/templates/manualJudgment/body-hipchat.vm
@@ -7,6 +7,6 @@ $notification.additionalContext.instructions
 #end
 For more details, please visit:
 <br/><br/>
-<a href="$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId">
-  $baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
+<a href="$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId">
+  $baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId
 </a>
diff --git a/echo-notifications/src/main/resources/templates/manualJudgment/body.vm b/echo-notifications/src/main/resources/templates/manualJudgment/body.vm
@@ -7,4 +7,4 @@ $htmlToText.convert($notification.additionalContext.instructions)
 
 For more details, please visit:
 
-$baseUrl/#/applications/$notification.source.application/executions/$notification.source.executionId
+$baseUrl/#/applications/$notification.source.application/executions/details/$notification.source.executionId
diff --git a/echo-notifications/src/main/resources/templates/stage.vm b/echo-notifications/src/main/resources/templates/stage.vm
@@ -1,3 +1,3 @@
 To see more details, please visit:
 
-$url/#/applications/$application/executions/$executionId
+$url/#/applications/$application/executions/details/$executionId
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ $htmlToText.convert($notification.additionalContext.instructions)

		For more details, please visit:

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