Fix workers view

This commit is contained in:
Piotr Sarnacki 2013-02-19 23:30:13 +01:00
parent 9ed3598f95
commit 9b26ae4312
5 changed files with 15 additions and 12 deletions

View File

@ -19,6 +19,10 @@ Travis.reopen
@set 'content', queues @set 'content', queues
WorkersController: Em.ArrayController.extend WorkersController: Em.ArrayController.extend
init: ->
@_super.apply this, arguments
@set 'content', Travis.Worker.find()
groups: (-> groups: (->
if content = @get 'arrangedContent' if content = @get 'arrangedContent'
groups = {} groups = {}

View File

@ -4,10 +4,7 @@ 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')
payload: DS.attr('object')
payload: (->
@get('data.payload')
).property('data.payload')
number: (-> number: (->
@get('name').match(/\d+$/)[0] @get('name').match(/\d+$/)[0]

View File

@ -1,6 +1,11 @@
require 'travis/ajax' require 'travis/ajax'
require 'models' require 'models'
DS.JSONTransforms['object'] = {
deserialize: (serialized) -> serialized
serialize: (deserialized) -> deserialized
}
Travis.RestAdapter = DS.RESTAdapter.extend Travis.RestAdapter = DS.RESTAdapter.extend
mappings: mappings:
broadcasts: Travis.Broadcast broadcasts: Travis.Broadcast

View File

@ -1,7 +1,7 @@
{{#view Travis.WorkersView}} {{#view Travis.WorkersView}}
<h4> <h4>
{{t workers}} {{t workers}}
<a id="toggle-workers" {{action toggleWorkers target="parentView.parentView"}}></a> <a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
</h4> </h4>
<ul id="workers"> <ul id="workers">
{{#each group in controller.groups}} {{#each group in controller.groups}}

View File

@ -29,11 +29,9 @@
WorkersView: Em.View.extend WorkersView: Em.View.extend
templateName: 'workers/list' templateName: 'workers/list'
controller: Travis.WorkersController.create() init: ->
didInsertElement: ->
@set 'controller.content', Travis.Worker.find()
@_super.apply this, arguments @_super.apply this, arguments
@set 'controller', @get('controller').container.lookup('controller:workers')
QueuesView: Em.View.extend QueuesView: Em.View.extend
templateName: 'queues/list' templateName: 'queues/list'
@ -67,7 +65,7 @@
WorkersView: Travis.View.extend WorkersView: Travis.View.extend
toggleWorkers: (event) -> toggleWorkers: ->
handle = $(event.target).toggleClass('open') handle = $(event.target).toggleClass('open')
if handle.hasClass('open') if handle.hasClass('open')
$('#workers li').addClass('open') $('#workers li').addClass('open')
@ -76,7 +74,7 @@
WorkersListView: Travis.View.extend WorkersListView: Travis.View.extend
toggle: (event) -> toggle: (event) ->
$(event.target).closest('li').toggleClass('open') this.$().find('> li').toggleClass('open')
WorkersItemView: Travis.View.extend WorkersItemView: Travis.View.extend
display: (-> display: (->
@ -89,6 +87,5 @@
"#{name}: #{state}" "#{name}: #{state}"
).property('worker.state') ).property('worker.state')
QueueItemView: Travis.View.extend QueueItemView: Travis.View.extend
tagName: 'li' tagName: 'li'