From b143b6451101d1488a39d03fefe0f5e96cf21ee6 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 30 Jul 2014 11:55:38 +1000
Subject: [PATCH] FIX: searchContext set too early

This was firing before previous route deactivated.
---
 .../javascripts/discourse/routes/build-category-route.js.es6    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index b95ab672b97..099746bc3e3 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -11,7 +11,6 @@ export default function(filter, params) {
         return;
       }
 
-      this.controllerFor('search').set('searchContext', model.get('searchContext'));
       this._setupNavigation(model);
       return Em.RSVP.all([this._createSubcategoryList(model),
                           this._retrieveTopicList(model, transaction)]);
@@ -84,6 +83,7 @@ export default function(filter, params) {
         noSubcategories: params && !!params.no_subcategories
       });
 
+      this.controllerFor('search').set('searchContext', model.get('searchContext'));
       this.set('topics', null);
     },