From 6fb15c4a97f1767e9857f9f3c0795352613c17a2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 14 Jan 2013 23:42:29 +0100
Subject: [PATCH] Show pull request number on the list

---
 assets/scripts/app/helpers/urls.coffee       |  3 +++
 assets/scripts/app/models/commit.coffee      | 19 ++++++++++---------
 assets/scripts/app/store.coffee              |  2 --
 assets/scripts/app/templates/builds/list.hbs | 16 +++++++++++++++-
 assets/scripts/app/views/build.coffee        |  9 +++++++++
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/assets/scripts/app/helpers/urls.coffee b/assets/scripts/app/helpers/urls.coffee
index 337da674..3e19832f 100644
--- a/assets/scripts/app/helpers/urls.coffee
+++ b/assets/scripts/app/helpers/urls.coffee
@@ -17,6 +17,9 @@
   job: (slug, id) ->
     "/#{slug}/jobs/#{id}"
 
+  githubPullRequest: (slug, pullRequestNumber) ->
+    "http://github.com/#{slug}/pull/#{pullRequestNumber}"
+
   githubCommit: (slug, sha) ->
     "http://github.com/#{slug}/commit/#{sha}"
 
diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee
index 3da6aebc..1f72af67 100644
--- a/assets/scripts/app/models/commit.coffee
+++ b/assets/scripts/app/models/commit.coffee
@@ -1,14 +1,15 @@
 require 'travis/model'
 
 @Travis.Commit = Travis.Model.extend
-  buildId:        DS.attr('number')
-  sha:            DS.attr('string')
-  branch:         DS.attr('string')
-  message:        DS.attr('string')
-  compareUrl:     DS.attr('string')
-  authorName:     DS.attr('string')
-  authorEmail:    DS.attr('string')
-  committerName:  DS.attr('string')
-  committerEmail: DS.attr('string')
+  buildId:           DS.attr('number')
+  sha:               DS.attr('string')
+  branch:            DS.attr('string')
+  message:           DS.attr('string')
+  compareUrl:        DS.attr('string')
+  authorName:        DS.attr('string')
+  authorEmail:       DS.attr('string')
+  committerName:     DS.attr('string')
+  committerEmail:    DS.attr('string')
+  pullRequestNumber: DS.attr('number')
 
   build: DS.belongsTo('Travis.Build', key: 'buildId')
diff --git a/assets/scripts/app/store.coffee b/assets/scripts/app/store.coffee
index 1c501f41..4f29dfa6 100644
--- a/assets/scripts/app/store.coffee
+++ b/assets/scripts/app/store.coffee
@@ -68,8 +68,6 @@ Travis.Store = DS.Store.extend
       { id: id, clientId: clientId }
 
   receive: (event, data) ->
-    return if event == 'worker:added' || event == 'worker:removed'
-
     [name, type] = event.split(':')
 
     mappings = @adapter.get('mappings')
diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs
index afc4c759..1920ff4d 100644
--- a/assets/scripts/app/templates/builds/list.hbs
+++ b/assets/scripts/app/templates/builds/list.hbs
@@ -4,7 +4,14 @@
       <tr>
         <th>{{t builds.name}}</th>
         <th>{{t builds.message}}</th>
-        <th>{{t builds.commit}}</th>
+        <th>
+          {{t builds.commit}}
+        </th>
+        {{#if view.isPullRequestsList}}
+          <th>
+            {{t builds.pr}}
+          </th>
+        {{/if}}
         <th>{{t builds.duration}}</th>
         <th>{{t builds.finished_at}}</th>
       </tr>
@@ -29,6 +36,13 @@
               {{formatCommit commit}}
             </a>
           </td>
+          {{#if commit.pullRequestNumber}}
+            <td>
+              <a {{bindAttr href="view.urlGithubPullRequest"}}>
+                #{{commit.pullRequestNumber}}
+              </a>
+            </td>
+          {{/if}}
           <td class="duration" {{bindAttr title="duration"}}>
             {{formatDuration duration}}
           </td>
diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee
index 709bd939..48b0f80f 100644
--- a/assets/scripts/app/views/build.coffee
+++ b/assets/scripts/app/views/build.coffee
@@ -3,6 +3,11 @@
     templateName: 'builds/list'
     buildsBinding: 'controller.builds'
 
+    isPullRequestsList: (->
+      console.log @get('controller.tab')
+      @get('controller.tab') == 'pull_requests'
+    ).property('controller.tab')
+
     showMore: ->
       id     = @get('controller.repo.id')
       number = @get('builds.lastObject.number')
@@ -43,6 +48,10 @@
       Travis.Urls.githubCommit(@get('repo.slug'), @get('commit.sha'))
     ).property('repo.slug', 'commit.sha')
 
+    urlGithubPullRequest: (->
+      Travis.Urls.githubPullRequest(@get('repo.slug'), @get('commit.pullRequestNumber'))
+    ).property('repo.slug', 'commit.pullRequestNumber')
+
   BuildView: Travis.View.extend
     templateName: 'builds/show'
     elementId: 'build'