From 9b26ae4312ad29e225b5c4cb33b1b46cda8b67a9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 19 Feb 2013 23:30:13 +0100
Subject: [PATCH] Fix workers view

---
 assets/scripts/app/controllers/sidebar.coffee |  4 ++++
 assets/scripts/app/models/worker.coffee       |  5 +----
 assets/scripts/app/store/rest_adapter.coffee  |  5 +++++
 assets/scripts/app/templates/workers/list.hbs |  2 +-
 assets/scripts/app/views/sidebar.coffee       | 11 ++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/assets/scripts/app/controllers/sidebar.coffee b/assets/scripts/app/controllers/sidebar.coffee
index 06bc3166..fedd6448 100644
--- a/assets/scripts/app/controllers/sidebar.coffee
+++ b/assets/scripts/app/controllers/sidebar.coffee
@@ -19,6 +19,10 @@ Travis.reopen
       @set 'content', queues
 
   WorkersController: Em.ArrayController.extend
+    init: ->
+      @_super.apply this, arguments
+      @set 'content', Travis.Worker.find()
+
     groups: (->
       if content = @get 'arrangedContent'
         groups = {}
diff --git a/assets/scripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee
index 3458d852..737bf113 100644
--- a/assets/scripts/app/models/worker.coffee
+++ b/assets/scripts/app/models/worker.coffee
@@ -4,10 +4,7 @@ require 'travis/model'
   state: DS.attr('string')
   name: DS.attr('string')
   host: DS.attr('string')
-
-  payload: (->
-    @get('data.payload')
-  ).property('data.payload')
+  payload: DS.attr('object')
 
   number: (->
     @get('name').match(/\d+$/)[0]
diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee
index 43b67fb1..5d53726e 100644
--- a/assets/scripts/app/store/rest_adapter.coffee
+++ b/assets/scripts/app/store/rest_adapter.coffee
@@ -1,6 +1,11 @@
 require 'travis/ajax'
 require 'models'
 
+DS.JSONTransforms['object'] = {
+  deserialize: (serialized) -> serialized
+  serialize: (deserialized) -> deserialized
+}
+
 Travis.RestAdapter = DS.RESTAdapter.extend
   mappings:
     broadcasts:   Travis.Broadcast
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs
index b7ae6ce5..af00a44b 100644
--- a/assets/scripts/app/templates/workers/list.hbs
+++ b/assets/scripts/app/templates/workers/list.hbs
@@ -1,7 +1,7 @@
 {{#view Travis.WorkersView}}
   <h4>
     {{t workers}}
-    <a id="toggle-workers" {{action toggleWorkers target="parentView.parentView"}}></a>
+    <a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
   </h4>
   <ul id="workers">
     {{#each group in controller.groups}}
diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee
index a6d98c6a..79daa5e9 100644
--- a/assets/scripts/app/views/sidebar.coffee
+++ b/assets/scripts/app/views/sidebar.coffee
@@ -29,11 +29,9 @@
 
     WorkersView: Em.View.extend
       templateName: 'workers/list'
-      controller: Travis.WorkersController.create()
-
-      didInsertElement: ->
-        @set 'controller.content', Travis.Worker.find()
+      init: ->
         @_super.apply this, arguments
+        @set 'controller', @get('controller').container.lookup('controller:workers')
 
     QueuesView: Em.View.extend
       templateName: 'queues/list'
@@ -67,7 +65,7 @@
 
 
   WorkersView: Travis.View.extend
-    toggleWorkers: (event) ->
+    toggleWorkers: ->
       handle = $(event.target).toggleClass('open')
       if handle.hasClass('open')
         $('#workers li').addClass('open')
@@ -76,7 +74,7 @@
 
   WorkersListView: Travis.View.extend
     toggle: (event) ->
-      $(event.target).closest('li').toggleClass('open')
+      this.$().find('> li').toggleClass('open')
 
   WorkersItemView: Travis.View.extend
     display: (->
@@ -89,6 +87,5 @@
         "#{name}: #{state}"
     ).property('worker.state')
 
-
   QueueItemView: Travis.View.extend
     tagName: 'li'