From 15a4ba045d0b6acc49b04eb4d2914fe2bbc12aa4 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 28 Jan 2015 13:00:20 +0100
Subject: [PATCH] Fix queue and running jobs controllers for ED

---
 assets/scripts/app/controllers/queue.coffee   |  3 +-
 .../app/controllers/running_jobs.coffee       |  3 +-
 assets/scripts/app/models/job.coffee          | 31 -------------------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/assets/scripts/app/controllers/queue.coffee b/assets/scripts/app/controllers/queue.coffee
index cbc45e4b..01dd0a14 100644
--- a/assets/scripts/app/controllers/queue.coffee
+++ b/assets/scripts/app/controllers/queue.coffee
@@ -3,7 +3,8 @@ Job = Travis.Job
 
 Controller = Em.ArrayController.extend
   content: (->
-    Job.queued()
+    @store.filter 'job', {}, (job) ->
+      ['created', 'queued'].indexOf(job.get('state')) != -1
   ).property()
 
 Travis.QueueController = Controller
diff --git a/assets/scripts/app/controllers/running_jobs.coffee b/assets/scripts/app/controllers/running_jobs.coffee
index f1d48459..719a3342 100644
--- a/assets/scripts/app/controllers/running_jobs.coffee
+++ b/assets/scripts/app/controllers/running_jobs.coffee
@@ -3,7 +3,8 @@ Job = Travis.Job
 
 Controller = Em.ArrayController.extend
   content: (->
-    Job.running()
+    @store.filter 'job', { state: 'started' }, (job) ->
+      ['started', 'received'].indexOf(job.get('state')) != -1
   ).property()
 
 Travis.RunningJobsController = Controller
diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee
index 509cc409..f6cac3a3 100644
--- a/assets/scripts/app/models/job.coffee
+++ b/assets/scripts/app/models/job.coffee
@@ -143,34 +143,3 @@ Ajax = Travis.ajax
   slug: (->
     "#{@get('repo.slug')} ##{@get('number')}"
   ).property()
-
-@Travis.Job.reopenClass
-  queued: ->
-    filtered = Ember.FilteredRecordArray.create(
-      modelClass: Travis.Job
-      filterFunction: (job) ->
-        ['created', 'queued'].indexOf(job.get('state')) != -1
-      filterProperties: ['state', 'queue']
-    )
-
-    @fetch().then (array) ->
-      filtered.updateFilter()
-      filtered.set('isLoaded', true)
-
-    filtered
-
-  running: ->
-    filtered = Ember.FilteredRecordArray.create(
-      modelClass: Travis.Job
-      filterFunction: (job) ->
-        ['started', 'received'].indexOf(job.get('state')) != -1
-      filterProperties: ['state']
-    )
-
-    @fetch(state: 'started').then (array) ->
-      filtered.updateFilter()
-      filtered.set('isLoaded', true)
-
-    filtered
-
-