Merge lp:~robru/bileto/excuses-link into lp:bileto

[Robert Bruce Park]

Add links to the excuses page for packages stuck in proposed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/bileto-ci/60/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/60/rebuild

review: Approve (continuous-integration)

[lp:~robru/bileto/excuses-link]

264. By Robert Bruce Park on 2015-09-10

Fix regex.

[lp:~robru/bileto/excuses-link]

265. By Robert Bruce Park on 2015-09-10

Fix regex... again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/bileto-ci/61/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/61/rebuild

review: Approve (continuous-integration)

[lp:~robru/bileto/excuses-link]

266. By Robert Bruce Park on 2015-09-10

Fix series as per cjwatson.

[Robert Bruce Park (robru)]

Thanks for the tip Colin, fixed & looking good in staging.

review: Approve

=== modified file 'tickets/static/app.js'
--- tickets/static/app.js	2015-09-02 19:57:39 +0000
+++ tickets/static/app.js	2015-09-10 15:59:16 +0000
@@ -1,3 +1,8 @@
+var EXCUSES = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/';
+var PPA_PREFIX = 'https://launchpad.net/~ci-train-ppa-service/+archive/';
+var SOURCE_PREFIX = 'https://launchpad.net/ubuntu/+source/';
+var TEAM_PREFIX = 'https://launchpad.net/~';
+
 var visibilitychange = null;
 var hidden = null;
 ['h', 'mozH', 'webkitH', 'msH', 'oH'].some(function(prefix) {
@@ -42,11 +47,16 @@
 function display_siloname(text) {
     text = (text || '');
     // TODO: Make PPA link link to correct staging/production PPA team
-    return a('https://launchpad.net/~ci-train-ppa-service/+archive/' + text, text)
+    return a(PPA_PREFIX + text, text)
 }
 
-function display_status(text, job_log) {
-    return a(job_log, '[log] ') + linkify((text || ''));
+function display_status(text, job_log, series) {
+    series = series || '';
+    series = {'dual': 'wily'}[series] || series;
+    text = a(job_log, '[log] ') + linkify((text || ''));
+    return text.replace(
+        /(\S+)( is in the Proposed pocket)/gi,
+        a(EXCUSES + series + '/update_excuses.html#$1', '$1') + '$2');
 }
 
 function display_landers(text) {
@@ -54,13 +64,13 @@
 }
 
 function display_sources(text) {
-    return link_each_word('https://launchpad.net/ubuntu/+source/', (text || ''));
+    return link_each_word(SOURCE_PREFIX, (text || ''));
 }
 
 function display_dest(text) {
     if (!text) return '';
     var parts = text.split(/\//);
-    return a('https://launchpad.net/~' + parts[0] + '/+archive/' + parts[1] + '/' + parts[2], parts[2]);
+    return a(TEAM_PREFIX + parts[0] + '/+archive/' + parts[1] + '/' + parts[2], parts[2]);
 }
 
 app.controller('appController', ['$scope', '$location', '$http', '$anchorScroll', function($scope, $location, $http, $anchorScroll) {

=== modified file 'tickets/static/index.html'
--- tickets/static/index.html	2015-09-02 18:02:37 +0000
+++ tickets/static/index.html	2015-09-10 15:59:16 +0000
@@ -69,7 +69,7 @@
 </tr>
 <tr ng-hide="display_this(req)">
 <td><p ng-bind-html="display_siloname(req.siloname)"></p></td>
-<td><p ng-bind-html="display_status(req.status, req.job_log)" class="{{req.status_color}}"></p></td>
+<td><p ng-bind-html="display_status(req.status, req.job_log, req.series)" class="{{req.status_color}}"></p></td>
 <td><p ng-bind-html="display_landers(req.landers)"></p></td>
 <td><p>{{sync_request}}</p></td>
 <td><p ng-bind-html="display_dest(req.dest)"></p></td>