From f2ca2d52602e0ece4807d4e7b55bb7909c34558e Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 22 Jan 2013 18:55:08 +0100 Subject: [PATCH] remove worker.lastSeenAt (useless anyway) and use payload.job instead of (deprecated) payload.build for active worker links --- assets/scripts/app/models/worker.coffee | 1 - assets/scripts/app/templates/workers/list.hbs | 2 +- assets/scripts/app/views/repo/show.coffee | 2 -- assets/scripts/app/views/sidebar.coffee | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/assets/scripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee index 66c3bdaa..881493e6 100644 --- a/assets/scripts/app/models/worker.coffee +++ b/assets/scripts/app/models/worker.coffee @@ -4,7 +4,6 @@ require 'travis/model' state: DS.attr('string') name: DS.attr('string') host: DS.attr('string') - lastSeenAt: DS.attr('string') payload: (-> @get('data.payload') diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs index bf5faf33..2096398b 100644 --- a/assets/scripts/app/templates/workers/list.hbs +++ b/assets/scripts/app/templates/workers/list.hbs @@ -17,7 +17,7 @@
{{#if worker.isWorking}} {{#if worker.jobId}} - + {{view.display}} {{/if}} diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index b2d83862..bee580b7 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -10,8 +10,6 @@ ).property('repo.isLoaded') isEmpty: (-> - console.log('repos.isLoaded', @get('repos.isLoaded')) - console.log('repos.length', @get('repos.length')) @get('repos.isLoaded') && @get('repos.length') == 0 ).property('repos.isLoaded', 'repos.length') diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee index 3b34fdf0..8f2d789b 100644 --- a/assets/scripts/app/views/sidebar.coffee +++ b/assets/scripts/app/views/sidebar.coffee @@ -69,9 +69,9 @@ state = @get('worker.state') payload = @get('worker.payload') - if state == 'working' && payload?.repository && payload?.build + if state == 'working' && payload?.repository && payload?.job repo = @get('worker.repoSlug') - number = ' #' + payload.build.number + number = ' #' + payload.job.number "#{name}: #{repo} #{number}".htmlSafe() else "#{name}: #{state}"