suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make WorkerItemView.display rely on the model more

Browse Source
This commit is contained in:
Sven Fuchs 2013-01-22 19:04:25 +01:00
parent abb14a8d39
commit 28e40ab0e4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/scripts/app/models/worker.coffee
View File

@ -25,6 +25,10 @@ require 'travis/model'
Travis.Job.find @get('job_id') Travis.Job.find @get('job_id')
).property('jobId') ).property('jobId')
jobNumber: (->
@get('payload.job.number')
).property('jobNumber')
repoData: (-> repoData: (->
{ id: @get('repoId'), slug: @get('repoSlug') } { id: @get('repoId'), slug: @get('repoSlug') }
).property('repoSlug', 'repoId') ).property('repoSlug', 'repoId')

7
assets/scripts/app/views/sidebar.coffee
View File

@ -67,12 +67,9 @@
display: (-> display: (->
name = (@get('worker.name') || '').replace('travis-', '') name = (@get('worker.name') || '').replace('travis-', '')
state = @get('worker.state') state = @get('worker.state')
payload = @get('worker.payload')
if state == 'working' && payload?.repository && payload?.job if state == 'working'
repo = @get('worker.repoSlug') "<span class='name'>#{name}: #{@get('worker.repoSlug')}</span> ##{@get('worker.jobNumber')}".htmlSafe()
number = ' #' + payload.job.number
"<span class='name'>#{name}: #{repo}</span> #{number}".htmlSafe()
else else
"#{name}: #{state}" "#{name}: #{state}"
).property('worker.state') ).property('worker.state')