From 075e714fc3f8e9237c25b6a3f074947b9de78e74 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 19 Feb 2013 07:01:12 +0100
Subject: [PATCH] Fix job view

---
 assets/scripts/app/controllers.coffee      |  1 +
 assets/scripts/app/controllers/job.coffee  |  6 ++
 assets/scripts/app/routes.coffee           | 30 ++++---
 assets/scripts/app/templates/jobs/list.hbs |  2 +-
 assets/scripts/app/templates/jobs/show.hbs | 94 +++++++++++-----------
 assets/scripts/app/views/job.coffee        |  2 +-
 6 files changed, 75 insertions(+), 60 deletions(-)
 create mode 100644 assets/scripts/app/controllers/job.coffee

diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index ac84eb2c..cc7a6f7d 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -17,6 +17,7 @@ require 'controllers/build'
 require 'controllers/builds'
 require 'controllers/flash'
 require 'controllers/home'
+require 'controllers/job'
 require 'controllers/profile'
 require 'controllers/repos'
 require 'controllers/repo'
diff --git a/assets/scripts/app/controllers/job.coffee b/assets/scripts/app/controllers/job.coffee
new file mode 100644
index 00000000..274a7555
--- /dev/null
+++ b/assets/scripts/app/controllers/job.coffee
@@ -0,0 +1,6 @@
+Travis.JobController = Em.Controller.extend
+  needs: ['repo']
+
+  jobBinding: 'controllers.repo.job'
+  repoBinding: 'controllers.repo.repo'
+  commitBinding: 'job.commit'
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 03122fc4..c0f4b8ea 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -382,10 +382,10 @@ Travis.Router.map ->
     @resource 'repo', path: '/:owner/:name', ->
       @route 'index', path: '/'
       @resource 'build', path: '/builds/:build_id'
+      @resource 'job',   path: '/jobs/:job_id'
 
 Travis.IndexCurrentRoute = Ember.Route.extend
   renderTemplate: ->
-    @render 'repo'
     @render 'build',   outlet: 'pane', into: 'repo'
 
   setupController: ->
@@ -394,15 +394,8 @@ Travis.IndexCurrentRoute = Ember.Route.extend
 Travis.BuildRoute = Ember.Route.extend
   renderTemplate: (->)
 
-
-  deserialize: (params) ->
-    Travis.Build.find(params.build_id)
-
   serialize: (model, params) ->
-    id = if model.get
-      model.get('id')
-    else
-      model
+    id = if model.get then model.get('id') else model
 
     { build_id: id }
 
@@ -410,8 +403,25 @@ Travis.BuildRoute = Ember.Route.extend
     model = Travis.Build.find(model) if model && !model.get
 
     repo = @container.lookup('controller:repo')
-    repo.activate('build')
     repo.set('build', model)
+    repo.activate('build')
+
+Travis.JobRoute = Ember.Route.extend
+  renderTemplate: ->
+    @render 'job', outlet: 'pane', into: 'repo'
+
+  serialize: (model, params) ->
+    id = if model.get then model.get('id') else model
+
+    { job_id: id }
+
+  setupController: (controller, model) ->
+    model = Travis.Job.find(model) if model && !model.get
+
+    repo = @container.lookup('controller:repo')
+    console.log model.toString()
+    repo.set('job', model)
+    repo.activate('job')
 
 Travis.RepoIndexRoute = Ember.Route.extend
   setupController: (controller, model) ->
diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs
index a59ff266..f691fa6d 100644
--- a/assets/scripts/app/templates/jobs/list.hbs
+++ b/assets/scripts/app/templates/jobs/list.hbs
@@ -24,7 +24,7 @@
           <td class="number">
             <span class="status"></span>
             {{#if job.id}}
-              <a {{action showJob repo job href=true}}>{{number}}</a>
+              {{#linkTo job repo job}}{{number}}{{/linkTo}}
             {{/if}}
           </td>
           <td class="duration" {{bindAttr title="startedAt"}}>
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index f49abed4..9fd42deb 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -1,51 +1,49 @@
-{{#with view}}
-  {{#if job.isLoaded}}
-    <div {{bindAttr class="view.color"}}>
-      <dl id="summary">
-        <div class="left">
-          <dt>Job</dt>
-          <dd class="number">
-            <span class="status"></span>
-            {{#if job.id}}
-              <a {{action showJob repo job href=true}}>{{job.number}}</a>
-            {{/if}}
-          </dd>
-          <dt>{{t jobs.state}}</dt>
-          <dd class="state">{{capitalize job.state}}</dd>
-          <dt class="finished_at_label">{{t jobs.finished_at}}</dt>
-          <dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime job.finishedAt}}</dd>
-          <dt>{{t jobs.duration}}</dt>
-          <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd>
-        </div>
-
-        <div class="right">
-          <dt>{{t jobs.commit}}</dt>
-          <dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit commit}}</a></dd>
-          {{#if commit.compareUrl}}
-            <dt>{{t jobs.compare}}</dt>
-            <dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd>
+{{#if job.isLoaded}}
+  <div {{bindAttr class="view.color"}}>
+    <dl id="summary">
+      <div class="left">
+        <dt>Job</dt>
+        <dd class="number">
+          <span class="status"></span>
+          {{#if job.id}}
+            {{#linkTo job repo job}}{{job.number}}{{/linkTo}}
           {{/if}}
-          {{#if commit.authorName}}
-            <dt>{{t jobs.author}}</dt>
-            <dd class="author"><a {{bindAttr href="urlAuthor"}}>{{commit.authorName}}</a></dd>
-          {{/if}}
-          {{#if commit.committerName}}
-            <dt>{{t jobs.committer}}</dt>
-            <dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{commit.committerName}}</a></dd>
-          {{/if}}
-        </div>
+        </dd>
+        <dt>{{t jobs.state}}</dt>
+        <dd class="state">{{capitalize job.state}}</dd>
+        <dt class="finished_at_label">{{t jobs.finished_at}}</dt>
+        <dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime job.finishedAt}}</dd>
+        <dt>{{t jobs.duration}}</dt>
+        <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd>
+      </div>
 
-        <dt>{{t jobs.message}}</dt>
-        <dd class="message">{{formatMessage commit.message}}</dd>
-        <dt>{{t jobs.config}}</dt>
-        <dd class="config">{{formatConfig job.config}}</dd>
-      </dl>
+      <div class="right">
+        <dt>{{t jobs.commit}}</dt>
+        <dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit commit}}</a></dd>
+        {{#if commit.compareUrl}}
+          <dt>{{t jobs.compare}}</dt>
+          <dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd>
+        {{/if}}
+        {{#if commit.authorName}}
+          <dt>{{t jobs.author}}</dt>
+          <dd class="author"><a {{bindAttr href="urlAuthor"}}>{{commit.authorName}}</a></dd>
+        {{/if}}
+        {{#if commit.committerName}}
+          <dt>{{t jobs.committer}}</dt>
+          <dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{commit.committerName}}</a></dd>
+        {{/if}}
+      </div>
 
-      {{view Travis.LogView contextBinding="job"}}}
-    </div>
-  {{else}}
-    <div id="job" class="loading">
-      <span>Loading</span>
-    </div>
-  {{/if}}
-{{/with}}
+      <dt>{{t jobs.message}}</dt>
+      <dd class="message">{{formatMessage commit.message}}</dd>
+      <dt>{{t jobs.config}}</dt>
+      <dd class="config">{{formatConfig job.config}}</dd>
+    </dl>
+
+    {{view Travis.LogView contextBinding="job"}}}
+  </div>
+{{else}}
+  <div id="job" class="loading">
+    <span>Loading</span>
+  </div>
+{{/if}}
diff --git a/assets/scripts/app/views/job.coffee b/assets/scripts/app/views/job.coffee
index 086346cc..edd3daf6 100644
--- a/assets/scripts/app/views/job.coffee
+++ b/assets/scripts/app/views/job.coffee
@@ -116,7 +116,7 @@
         else
           'showJob'
 
-        Travis.app.get('router').urlForEvent(event, repo, item)
+        #Travis.get('router').urlForEvent(event, repo, item)
     ).property('job.repo', 'parentView.currentItem')
 
   PreView: Em.View.extend