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

Fix queues lists

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-02-19 22:01:58 +01:00
parent 4cdd4df515
commit 86670def14
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/scripts/app/controllers/sidebar.coffee
View File

@ -7,7 +7,16 @@ Travis.reopen
tick: -> tick: ->
tickable.tick() for tickable in @tickables tickable.tick() for tickable in @tickables
QueuesController: Em.ArrayController.extend() QueuesController: Em.ArrayController.extend
init: ->
@_super.apply this, arguments
queues = for queue in Travis.QUEUES
Travis.LimitedArray.create
content: Travis.Job.queued(queue.name), limit: 20
id: "queue_#{queue.name}"
name: queue.display
@set 'content', queues
WorkersController: Em.ArrayController.extend WorkersController: Em.ArrayController.extend
groups: (-> groups: (->

6
assets/scripts/app/routes.coffee
View File

@ -452,10 +452,14 @@ Travis.RepoRoute = Ember.Route.extend
@render 'repo' @render 'repo'
setupController: (controller, model) -> setupController: (controller, model) ->
# TODO: if repo is just a data hash with id and slug load it
# as incomplete record
model = Travis.Repo.find(model.id) if model && !model.get
controller.set('repo', model) controller.set('repo', model)
serialize: (repo) -> serialize: (repo) ->
[owner, name] = repo.get('slug').split('/') slug = if repo.get then repo.get('slug') else repo.slug
[owner, name] = slug.split('/')
{ owner: owner, name: name } { owner: owner, name: name }
deserialize: (params) -> deserialize: (params) ->

4
assets/scripts/app/templates/queues/list.hbs
View File

@ -6,12 +6,12 @@
{{#each job in queue}} {{#each job in queue}}
{{#view Travis.QueueItemView jobBinding="job"}} {{#view Travis.QueueItemView jobBinding="job"}}
{{#if job.repoSlug}} {{#if job.repoSlug}}
<a {{action showJob job.repoData job target="Travis.app.router" href=true}}> {{#linkTo "job" job.repoData job}}
<span class="slug"> <span class="slug">
{{job.repoSlug}} {{job.repoSlug}}
</span> </span>
#{{job.number}} #{{job.number}}
</a> {{/linkTo}}
{{/if}} {{/if}}
{{/view}} {{/view}}
{{else}} {{else}}

4
assets/scripts/app/templates/workers/list.hbs
View File

@ -17,9 +17,9 @@
<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}}> {{#linkTo "job" worker.repoData worker.jobId}}
{{view.display}} {{view.display}}
</a> {{/linkTo}}
{{/if}} {{/if}}
{{else}} {{else}}
{{view.display}} {{view.display}}

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

@ -37,21 +37,15 @@
QueuesView: Em.View.extend QueuesView: Em.View.extend
templateName: 'queues/list' templateName: 'queues/list'
controller: Em.ArrayController.create() init: ->
@_super.apply this, arguments
@set 'controller', @get('controller').container.lookup('controller:queues')
showAll: (event) -> showAll: (event) ->
queue = event.context queue = event.context
queue.showAll() queue.showAll()
didInsertElement: ->
queues = for queue in Travis.QUEUES
Travis.LimitedArray.create
content: Travis.Job.queued(queue.name), limit: 20
id: "queue_#{queue.name}"
name: queue.display
@set 'controller.content', queues
@_super.apply this, arguments
RunningJobsView: Em.View.extend RunningJobsView: Em.View.extend
templateName: 'jobs/running' templateName: 'jobs/running'
elementId: 'running-jobs' elementId: 'running-jobs'