From be19251ff31659f6a983402a023581913d373003 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 1 Oct 2012 16:47:08 +0200 Subject: [PATCH] Fix job links on the sidebar --- assets/javascripts/app/models/worker.coffee | 4 ++-- assets/javascripts/app/routes.coffee | 10 ++++++++++ assets/javascripts/app/templates/workers/list.hbs | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/app/models/worker.coffee b/assets/javascripts/app/models/worker.coffee index 482a9a6f..df13f7f9 100644 --- a/assets/javascripts/app/models/worker.coffee +++ b/assets/javascripts/app/models/worker.coffee @@ -19,8 +19,8 @@ require 'travis/model' ).property('state') repository: (-> - @get('payload.repository.slug') - ).property('payload.repository.slug') + Travis.Repository.find(@get('payload.repository.id')) + ).property('payload.repository.id') job_id: (-> @get('payload.job.id') diff --git a/assets/javascripts/app/routes.coffee b/assets/javascripts/app/routes.coffee index 47d62d00..205dfe2f 100644 --- a/assets/javascripts/app/routes.coffee +++ b/assets/javascripts/app/routes.coffee @@ -214,11 +214,21 @@ Travis.Router = Ember.Router.extend router.get('repositoryController').activate 'branches' job: Ember.Route.extend + route: '/jobs/:job_id' connectOutlets: (router, job) -> + unless job.get + # In case I use id + job = Travis.Job.find(job) router.get('repositoryController').set 'job', job router.get('repositoryController').activate 'job' + serialize: (router, job) -> + if job.get + { job_id: job.get('id') } + else + { job_id: job } + deserialize: (router, params) -> job = Travis.Job.find params.job_id deferred = $.Deferred() diff --git a/assets/javascripts/app/templates/workers/list.hbs b/assets/javascripts/app/templates/workers/list.hbs index f80ed6b5..20de034f 100644 --- a/assets/javascripts/app/templates/workers/list.hbs +++ b/assets/javascripts/app/templates/workers/list.hbs @@ -16,8 +16,8 @@
  • {{#if worker.isWorking}} - {{#if view.job.id}} - + {{#if worker.job_id}} + {{view.display}} {{/if}}