From 00653e9420bca5fd5ac93500c725b3b0b49b3300 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 7 Dec 2015 17:48:33 +0100
Subject: [PATCH] Fix repo search

---
 app/models/repo.coffee        | 4 +++-
 app/routes/main-tab.coffee    | 9 ++++++---
 app/routes/main/search.coffee | 3 +--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/models/repo.coffee b/app/models/repo.coffee
index 5ac6ed2d..ced73b63 100644
--- a/app/models/repo.coffee
+++ b/app/models/repo.coffee
@@ -148,7 +148,9 @@ Repo.reopenClass
       result.pushObjects(promise.get('content').toArray())
       result.set('isLoaded', true)
 
-    result
+      result
+
+    promise
 
   withLastBuild: (store) ->
     repos = store.filter('repo', {}, (build) ->
diff --git a/app/routes/main-tab.coffee b/app/routes/main-tab.coffee
index fada43c3..b98e7587 100644
--- a/app/routes/main-tab.coffee
+++ b/app/routes/main-tab.coffee
@@ -11,9 +11,7 @@ Route = TravisRoute.extend
     @controllerFor('repo').activate('index')
     @controllerFor('repos').activate(@get('reposTabName'))
 
-    @currentRepoDidChange()
-    if repos = @controllerFor('repos')
-      repos.addObserver('repos.firstObject', this, 'currentRepoDidChange')
+    @setCurrentRepoObservers()
 
   deactivate: ->
     if repos = @controllerFor('repos')
@@ -25,6 +23,11 @@ Route = TravisRoute.extend
     if repo = @controllerFor('repos').get('repos.firstObject')
       @controllerFor('repo').set('repo', repo)
 
+  setCurrentRepoObservers: ->
+    @currentRepoDidChange()
+    if repos = @controllerFor('repos')
+      repos.addObserver('repos.firstObject', this, 'currentRepoDidChange')
+
   actions:
     redirectToGettingStarted: ->
       @transitionTo('getting_started')
diff --git a/app/routes/main/search.coffee b/app/routes/main/search.coffee
index db0e011d..58d48426 100644
--- a/app/routes/main/search.coffee
+++ b/app/routes/main/search.coffee
@@ -10,8 +10,7 @@ Route = MainTabRoute.extend
     @controllerFor('repo').activate('index')
     @controllerFor('repos').activate('search', searchPhrase)
 
-    @currentRepoDidChange()
-    @controllerFor('repos').addObserver('firstObject', this, 'currentRepoDidChange')
+    @setCurrentRepoObservers()
 
   model: (params) ->
     params.phrase.replace(/%2F/g, '/')