remove worker.lastSeenAt (useless anyway) and use payload.job instead of (deprecated) payload.build for active worker links
This commit is contained in:
parent
9be127fa59
commit
f2ca2d5260
|
@ -4,7 +4,6 @@ require 'travis/model'
|
||||||
state: DS.attr('string')
|
state: DS.attr('string')
|
||||||
name: DS.attr('string')
|
name: DS.attr('string')
|
||||||
host: DS.attr('string')
|
host: DS.attr('string')
|
||||||
lastSeenAt: DS.attr('string')
|
|
||||||
|
|
||||||
payload: (->
|
payload: (->
|
||||||
@get('data.payload')
|
@get('data.payload')
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<div class="status"></div>
|
<div class="status"></div>
|
||||||
{{#if worker.isWorking}}
|
{{#if worker.isWorking}}
|
||||||
{{#if worker.jobId}}
|
{{#if worker.jobId}}
|
||||||
<a {{action showJob worker.repoData worker.jobId target="Travis.app.router" href=true}} {{bindAttr title="worker.lastSeenAt"}}>
|
<a {{action showJob worker.repoData worker.jobId target="Travis.app.router" href=true}}>
|
||||||
{{view.display}}
|
{{view.display}}
|
||||||
</a>
|
</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
).property('repo.isLoaded')
|
).property('repo.isLoaded')
|
||||||
|
|
||||||
isEmpty: (->
|
isEmpty: (->
|
||||||
console.log('repos.isLoaded', @get('repos.isLoaded'))
|
|
||||||
console.log('repos.length', @get('repos.length'))
|
|
||||||
@get('repos.isLoaded') && @get('repos.length') == 0
|
@get('repos.isLoaded') && @get('repos.length') == 0
|
||||||
).property('repos.isLoaded', 'repos.length')
|
).property('repos.isLoaded', 'repos.length')
|
||||||
|
|
||||||
|
|
|
@ -69,9 +69,9 @@
|
||||||
state = @get('worker.state')
|
state = @get('worker.state')
|
||||||
payload = @get('worker.payload')
|
payload = @get('worker.payload')
|
||||||
|
|
||||||
if state == 'working' && payload?.repository && payload?.build
|
if state == 'working' && payload?.repository && payload?.job
|
||||||
repo = @get('worker.repoSlug')
|
repo = @get('worker.repoSlug')
|
||||||
number = ' #' + payload.build.number
|
number = ' #' + payload.job.number
|
||||||
"<span class='name'>#{name}: #{repo}</span> #{number}".htmlSafe()
|
"<span class='name'>#{name}: #{repo}</span> #{number}".htmlSafe()
|
||||||
else
|
else
|
||||||
"#{name}: #{state}"
|
"#{name}: #{state}"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user